Redeclaration of standard functions by dlmalloc. Fixed. Re-enabled warnings in Jamrules.

diff --git a/Jamrules b/Jamrules
index d04c45dfddd47c5f6635064d070f914ca5158c83..47f1ef8a0f68068df40a87011e3391d1209d1e97 100644 (file)
--- a/Jamrules
+++ b/Jamrules
@@ -31,15 +31,11 @@ if $(PDCLIB_TOOLCHAIN) = "" {
 }
 
 if $(PDCLIB_TOOLCHAIN) = "gcc" {
 }
 
 if $(PDCLIB_TOOLCHAIN) = "gcc" {

-    # No -Wcast-align      : spurious warnings when using char* to do pointer 
-    #                        arithmetic
-    # No -Winline          : when compiling with e.g. -Os causes spurious 
-    #                        warnings that call is unlikely/code size would grow
-    # No -Wredundant-decls : some functions must be multiply defined

     PDCLIB_WARNINGS ?= 
       -Wall -Wextra -pedantic -Wno-unused-parameter -Wshadow 
       -Wpointer-arith -Wwrite-strings -Wmissing-declarations -Wno-long-long 
     PDCLIB_WARNINGS ?= 
       -Wall -Wextra -pedantic -Wno-unused-parameter -Wshadow 
       -Wpointer-arith -Wwrite-strings -Wmissing-declarations -Wno-long-long 

-      -Wuninitialized 
+      -Wuninitialized -Wno-deprecated-declarations -Wredundant-decls -Winline
+      -Wcast-align

       ;
     PDCLIB_CCWARNINGS ?= 
       -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes ;
       ;
     PDCLIB_CCWARNINGS ?= 
       -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes ;


@@ -203,4 +199,4 @@ rule MakeLocate
         Depends $(<) : $(_dir:G=dir) ;
         MkDir $(_dir:G=dir) ;
     }
         Depends $(<) : $(_dir:G=dir) ;
         MkDir $(_dir:G=dir) ;
     }

-}
\ No newline at end of file
+}

diff --git a/opt/dlmalloc/dlmalloc.c b/opt/dlmalloc/dlmalloc.c
index 18cf0d6511db5bd30a15ec6cb1440d5c2bf84b92..865b5b95afa46c04084dc241ceff38589d160b17 100644 (file)
--- a/opt/dlmalloc/dlmalloc.c
+++ b/opt/dlmalloc/dlmalloc.c
@@ -835,6 +835,8 @@ extern "C" {
 #define dlbulk_free            bulk_free\r
 #endif /* USE_DL_PREFIX */\r
 \r
 #define dlbulk_free            bulk_free\r
 #endif /* USE_DL_PREFIX */\r
 \r

+#if 0 // Redeclaration warnings as PDCLib already declares these in <stdio.h>\r
+\r

 /*\r
   malloc(size_t n)\r
   Returns a pointer to a newly allocated chunk of at least n bytes, or\r
 /*\r
   malloc(size_t n)\r
   Returns a pointer to a newly allocated chunk of at least n bytes, or\r


@@ -891,6 +893,8 @@ DLMALLOC_EXPORT void* dlcalloc(size_t, size_t);
 */\r
 DLMALLOC_EXPORT void* dlrealloc(void*, size_t);\r
 \r
 */\r
 DLMALLOC_EXPORT void* dlrealloc(void*, size_t);\r
 \r

+#endif\r
+\r

 /*\r
   realloc_in_place(void* p, size_t n)\r
   Resizes the space allocated for p to size n, only if this can be\r
 /*\r
   realloc_in_place(void* p, size_t n)\r
   Resizes the space allocated for p to size n, only if this can be\r