get rid of xbt_os_thread_yield() using C++11

[simgrid.git] / src / xbt / mmalloc / mmprivate.h

diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h
index 640e09fe28ee4c4d2c1b55d6166fe69c6a25478c..95d52c1784003a616379e0f88e2374435184b561 100644 (file)
--- a/src/xbt/mmalloc/mmprivate.h
+++ b/src/xbt/mmalloc/mmprivate.h
@@ -26,6 +26,13 @@
 #include <pthread.h>
 #include <stdint.h>
 
 #include <pthread.h>
 #include <stdint.h>
 

+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+#ifndef MAX
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
+

 #ifdef HAVE_LIMITS_H
 #  include <limits.h>
 #else
 #ifdef HAVE_LIMITS_H
 #  include <limits.h>
 #else


@@ -277,13 +284,13 @@ struct mdesc {
 
 /* A default malloc descriptor for the single sbrk() managed region. */
 
 
 /* A default malloc descriptor for the single sbrk() managed region. */
 

-XBT_PUBLIC_DATA( struct mdesc ) *__mmalloc_default_mdp;
+XBT_PUBLIC_DATA struct mdesc* __mmalloc_default_mdp;

 
 /* Remap a mmalloc region that was previously mapped. */
 
 
 /* Remap a mmalloc region that was previously mapped. */
 

-XBT_PUBLIC( void *)__mmalloc_remap_core(xbt_mheap_t mdp);
+XBT_PUBLIC void* __mmalloc_remap_core(xbt_mheap_t mdp);

 
 

-XBT_PUBLIC( void *)mmorecore(struct mdesc *mdp, ssize_t size);
+XBT_PUBLIC void* mmorecore(struct mdesc* mdp, ssize_t size);

 
 /** Thread-safety (if the mutex is already created)
  *
 
 /** Thread-safety (if the mutex is already created)
  *