Changeset c101756

Timestamp:

Mar 6, 2019, 9:57:42 AM (6 years ago)

Author:

tdelisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

fca6ca6

Parents:

61dbb54 (diff), b38433b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

libcfa/prelude

Files:

• extras.c (modified) (1 diff)
• extras.regx (modified) (1 diff)

libcfa/prelude/extras.c

@@ -1 @@
-#include <stddef.h>                                     // size_t, ptrdiff_t
+#include <stddef.h>                                     // size_t, ptrdiff_t, intptr_t, uintptr_t
 #include <stdint.h>                                     // intX_t, uintX_t, where X is 8, 16, 32, 64
 #include <uchar.h>                                      // char16_t, char32_t

libcfa/prelude/extras.regx

@@ -1 +1 @@
 typedef.* size_t;
 typedef.* ptrdiff_t;
+typedef.* intptr_t;
+typedef.* uintptr_t;
 typedef.* __int8_t;
 typedef.* __int16_t;