Changeset b11fac4 for src/libcfa/stdlib.c

Timestamp:

Apr 13, 2016, 5:40:32 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

02af22de

Parents:

02ad3f5 (diff), 45161b4d (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/stdlib.c (modified) (3 diffs)

src/libcfa/stdlib.c

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Apr 12 18:19:22 2016
-// Update Count     : 151
+// Last Modified On : Wed Apr 13 14:49:58 2016
+// Update Count     : 155
 //
 
@@ -31 +31 @@
     return (T *)malloc( sizeof(T) );
 } // malloc
-forall( otype T ) T * malloc( size_t size ) {
-        //printf( "malloc2\n" );
-    return (T *)(void *)malloc( size );
-} // malloc
 forall( otype T ) T * malloc( char fill ) {
         //printf( "malloc3\n" );
@@ -41 +37 @@
 } // malloc
 
-forall( otype T ) T * calloc( size_t size ) {
+forall( otype T ) T * calloc( size_t nmemb ) {
         //printf( "calloc\n" );
-    return (T *)calloc( size, sizeof(T) );
+    return (T *)calloc( nmemb, sizeof(T) );
 } // calloc