Changeset 4e1572f for src/libcfa/stdhdr

Timestamp:

Jul 26, 2018, 5:21:03 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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

dccad9f

Parents:

56de5932 (diff), a95c117 (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:

src/libcfa/stdhdr

Files:

• bfdlink.h (modified) (2 diffs)
• hwloc.h (modified) (2 diffs)
• krb5.h (modified) (2 diffs)
• malloc.h (modified) (1 diff)

src/libcfa/stdhdr/bfdlink.h

@@ -10 +10 @@
 // Created On       : Tue Jul 18 07:26:04 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 18 07:46:50 2017
-// Update Count     : 3
+// Last Modified On : Sun Jul 22 13:49:30 2018
+// Update Count     : 4
 // 
 
@@ -20 +20 @@
 #endif
 
-#include_next <bfdlink.h>                                                               // must have internal check for multiple expansion
+#include_next <bfdlink.h>                                                               // has internal check for multiple expansion
 
 #if defined( with ) && defined( __CFA_BFDLINK_H__ )             // reset only if set

src/libcfa/stdhdr/hwloc.h

@@ -10 +10 @@
 // Created On       : Tue Jul 18 07:45:00 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 18 07:56:33 2017
-// Update Count     : 3
+// Last Modified On : Sun Jul 22 13:49:58 2018
+// Update Count     : 4
 // 
 
@@ -20 +20 @@
 #endif
 
-#include_next <hwloc.h>                                                                 // must have internal check for multiple expansion
+#include_next <hwloc.h>                                                                 // has internal check for multiple expansion
 
 #if defined( thread ) && defined( __CFA_HWLOC_H__ )             // reset only if set

src/libcfa/stdhdr/krb5.h

@@ -10 +10 @@
 // Created On       : Tue Jul 18 07:55:44 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 18 07:58:01 2017
-// Update Count     : 3
+// Last Modified On : Sun Jul 22 13:50:24 2018
+// Update Count     : 4
 // 
 
@@ -20 +20 @@
 #endif
 
-#include_next <krb5.h>                                                                  // must have internal check for multiple expansion
+#include_next <krb5.h>                                                                  // has internal check for multiple expansion
 
 #if defined( enable ) && defined( __CFA_KRB5_H__ )              // reset only if set

src/libcfa/stdhdr/malloc.h

@@ -10 +10 @@
 // Created On       : Thu Jul 20 15:58:16 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 20 16:00:12 2017
-// Update Count     : 4
+// Last Modified On : Mon Jul 23 18:20:32 2018
+// Update Count     : 8
 // 
+
+
+size_t default_mmap_start();                                                    // CFA extras
+size_t default_heap_expansion();
+extern "C" {
+size_t malloc_alignment( void * );
+_Bool malloc_zero_fill( void * );
+int malloc_stats_fd( int fd );
+void * cmemalign( size_t alignment, size_t noOfElems, size_t elemSize );
+} // extern "C"
 
 extern "C" {