Changeset fbb4e4 in git

Timestamp:

Jul 31, 2015, 8:46:58 PM (8 years ago)

Author:

Felix Janda <felix.janda@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

5ae6c5a8067deb29160f472baf843bcb540dea80

Parents:

6a52f15f9780f7af3a0ea06d03b4376f61136261

Message:

omalloc: Use void *memalign(size_t, size_t) unconditionally

All current systems seem to use this prototype. Some systems
such as Linux using the musl c library have memalign in
<stdlib.h>, which conflicts with the previous prototype
void *memalign(void *, size_t).

Location:

omalloc

Files:

• omAllocFunc.h (modified) (1 diff)
• omalloc.c (modified) (1 diff)

omalloc/omAllocFunc.h

@@ -12 +12 @@
 void omFreeFunc(void* addr);
 void* omVallocFunc(size_t size);
-#if defined(sgi)
 void* omMemalignFunc(size_t size_1, size_t size_2);
-#else
-#if (defined(__sun) && (defined(__sparc) || defined(__i386) || defined(__x86_64)) || defined(__CYGWIN__))
-extern void* omMemalignFunc(size_t, size_t);
-#else
-void* omMemalignFunc(void* alignment, size_t size);
-#endif
-#endif
 void* omReallocFunc(void* old_addr, size_t new_size);
 char* omStrdupFunc(const char* addr);

omalloc/omalloc.c

@@ -47 +47 @@
 }
 
-#if defined(sgi)
 void* memalign(size_t size_1, size_t size_2)
-#elif (defined(__sun) && (defined(__sparc) || defined(__i386) || defined(__x86_64)) || defined(__CYGWIN__))
-void* memalign(size_t size_1, size_t size_2)
-#else
-void* memalign(void* alignment, size_t size)
-#endif
 {
   fprintf(stderr, "omalloc Warning: memalign not yet implemented\n");