Revert reordering of declarations; for easier tracking of upstream changes.

diff --git a/functions/_dlmalloc/dlmalloc.c b/functions/_dlmalloc/dlmalloc.c
index 54703d480f5c5e89acf656a0f11c6a691930c107..33e393bbfdd311be1aa2ee4108d354483b77d2b2 100644 (file)
--- a/functions/_dlmalloc/dlmalloc.c
+++ b/functions/_dlmalloc/dlmalloc.c
@@ -893,20 +893,6 @@ DLMALLOC_EXPORT void* dlcalloc(size_t, size_t);
 */\r
 DLMALLOC_EXPORT void* dlrealloc(void*, size_t);\r
 \r
-/*\r
-  memalign(size_t alignment, size_t n);\r
-  Returns a pointer to a newly allocated chunk of n bytes, aligned\r
-  in accord with the alignment argument.\r
-\r
-  The alignment argument should be a power of two. If the argument is\r
-  not a power of two, the nearest greater power is used.\r
-  8-byte alignment is guaranteed by normal malloc calls, so don't\r
-  bother calling memalign with an argument of 8 or less.\r
-\r
-  Overreliance on memalign is a sure way to fragment space.\r
-*/\r
-DLMALLOC_EXPORT void* dlmemalign(size_t, size_t);\r
-\r
 #endif\r
 \r
 /*\r
@@ -924,6 +910,24 @@ DLMALLOC_EXPORT void* dlmemalign(size_t, size_t);
 */\r
 DLMALLOC_EXPORT void* dlrealloc_in_place(void*, size_t);\r
 \r
+#if 0 // Redeclaration warnings as PDCLib already declares these in <stdio.h>\r
+\r
+/*\r
+  memalign(size_t alignment, size_t n);\r
+  Returns a pointer to a newly allocated chunk of n bytes, aligned\r
+  in accord with the alignment argument.\r
+\r
+  The alignment argument should be a power of two. If the argument is\r
+  not a power of two, the nearest greater power is used.\r
+  8-byte alignment is guaranteed by normal malloc calls, so don't\r
+  bother calling memalign with an argument of 8 or less.\r
+\r
+  Overreliance on memalign is a sure way to fragment space.\r
+*/\r
+DLMALLOC_EXPORT void* dlmemalign(size_t, size_t);\r
+\r
+#endif\r
+\r
 /*\r
   int posix_memalign(void** pp, size_t alignment, size_t n);\r
   Allocates a chunk of n bytes, aligned in accord with the alignment\r