Changeset dd0b961 for src

Timestamp:

Feb 1, 2017, 10:27:33 AM (7 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:

ffc3b26

Parents:

6dc78dee (diff), a9fc180 (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) (1 diff)

src/libcfa/stdlib.c

@@ -29 +29 @@
 forall( dtype T | sized(T) ) T * malloc( void ) {
         //printf( "malloc1\n" );
-    return (T *)malloc( sizeof(T) );
+    return (T *)(void*)malloc( (size_t)sizeof(T) );
 } // malloc
 forall( dtype T | sized(T) ) T * malloc( char fill ) {
         //printf( "malloc3\n" );
-        T * ptr = (T *)malloc( sizeof(T) );
+        T * ptr = (T *)(void*)malloc( (size_t)sizeof(T) );
     return memset( ptr, (int)fill, sizeof(T) );
 } // malloc