kill little useless things in mmalloc. Still searching how to do the Big Cleanup...

diff --git a/src/xbt/mmalloc/mmap-sup.c b/src/xbt/mmalloc/mmap-sup.c
index 28f89bc..964e484 100644 (file)
--- a/src/xbt/mmalloc/mmap-sup.c
+++ b/src/xbt/mmalloc/mmap-sup.c
@@ -20,10 +20,6 @@
 #include <fcntl.h>
 #include <sys/mman.h>
 
 #include <fcntl.h>
 #include <sys/mman.h>
 

-#ifndef SEEK_SET
-#define SEEK_SET 0
-#endif
-

 #include "mmprivate.h"
 #include "xbt/ex.h"
 
 #include "mmprivate.h"
 #include "xbt/ex.h"
 


@@ -33,22 +29,17 @@
    it out. */
 
 static size_t pagesize;
    it out. */
 
 static size_t pagesize;

-#if NEED_DECLARATION_GETPAGESIZE
-extern int getpagesize(void);
-#endif

 
 #define PAGE_ALIGN(addr) (void*) (((long)(addr) + pagesize - 1) & \
                                    ~(pagesize - 1))
 
 /* Return MAP_PRIVATE if MDP represents /dev/zero.  Otherwise, return
    MAP_SHARED.  */
 
 #define PAGE_ALIGN(addr) (void*) (((long)(addr) + pagesize - 1) & \
                                    ~(pagesize - 1))
 
 /* Return MAP_PRIVATE if MDP represents /dev/zero.  Otherwise, return
    MAP_SHARED.  */

-

 #define MAP_PRIVATE_OR_SHARED(MDP) (( MDP -> flags & MMALLOC_ANONYMOUS) \
                                     ? MAP_PRIVATE \
                                     : MAP_SHARED)
 
 /* Return MAP_ANONYMOUS if MDP uses anonymous mapping. Otherwise, return 0 */
 #define MAP_PRIVATE_OR_SHARED(MDP) (( MDP -> flags & MMALLOC_ANONYMOUS) \
                                     ? MAP_PRIVATE \
                                     : MAP_SHARED)
 
 /* Return MAP_ANONYMOUS if MDP uses anonymous mapping. Otherwise, return 0 */

-

 #define MAP_IS_ANONYMOUS(MDP) (((MDP) -> flags & MMALLOC_ANONYMOUS) \
                               ? MAP_ANONYMOUS \
                               : 0)
 #define MAP_IS_ANONYMOUS(MDP) (((MDP) -> flags & MMALLOC_ANONYMOUS) \
                               ? MAP_ANONYMOUS \
                               : 0)

diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h
index d3f8442..f351b59 100644 (file)
--- a/src/xbt/mmalloc/mmprivate.h
+++ b/src/xbt/mmalloc/mmprivate.h
@@ -26,10 +26,6 @@
 #  endif
 #endif
 
 #  endif
 #endif
 

-#ifndef MIN
-#  define MIN(A, B) ((A) < (B) ? (A) : (B))
-#endif
-

 #define MMALLOC_MAGIC          "mmalloc"       /* Mapped file magic number */
 #define MMALLOC_MAGIC_SIZE     8       /* Size of magic number buf */
 #define MMALLOC_VERSION                1       /* Current mmalloc version */
 #define MMALLOC_MAGIC          "mmalloc"       /* Mapped file magic number */
 #define MMALLOC_MAGIC_SIZE     8       /* Size of magic number buf */
 #define MMALLOC_VERSION                1       /* Current mmalloc version */


@@ -248,7 +244,6 @@ void mmalloc_display_info(void *h);
 #define MMALLOC_DEVZERO                (1 << 0)        /* Have mapped to /dev/zero */
 #define MMALLOC_ANONYMOUS (1 << 1)      /* Use anonymous mapping */
 #define MMALLOC_INITIALIZED    (1 << 2)        /* Initialized mmalloc */
 #define MMALLOC_DEVZERO                (1 << 0)        /* Have mapped to /dev/zero */
 #define MMALLOC_ANONYMOUS (1 << 1)      /* Use anonymous mapping */
 #define MMALLOC_INITIALIZED    (1 << 2)        /* Initialized mmalloc */

-#define MMALLOC_MMCHECK_USED   (1 << 3)        /* mmcheckf() called already */

 
 /* Internal version of `mfree' used in `morecore'. */
 
 
 /* Internal version of `mfree' used in `morecore'. */