Changeset a6af031 for src

Timestamp:

Apr 3, 2017, 12:26:38 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

221c2de7

Parents:

727cf70f (diff), 7444113 (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

File:

• src/libcfa/startup.h (modified) (2 diffs)

src/libcfa/startup.h

@@ -18 +18 @@
 #define STARTUP_H
 
+#if GCC_VERSION > 50000
 extern "C" {
         enum {
@@ -26 +27 @@
         };
 }
+#else
+#define STARTUP_PRIORITY_CORE       101
+#define STARTUP_PRIORITY_KERNEL     102
+#define STARTUP_PRIORITY_MEMORY     103
+#define STARTUP_PRIORITY_IOSTREAM   104
+#endif
 
 #endif //STARTUP_H