cosmetics

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2834 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index bdd9e92..1e8f77f 100644 (file)
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -36,13 +36,13 @@
 
 #if defined(__GNUC__) && ! defined(__STRICT_ANSI__)
 # define _XBT_FUNCTION __FUNCTION__
-# define _XBT_INLINE inline
+# define XBT_INLINE inline
 #elif (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
 # define _XBT_FUNC__ __func__      /* ISO-C99 compliant */
-# define _XBT_INLINE inline
+# define XBT_INLINE inline
 #else
 # define _XBT_FUNCTION "function"
-# define _XBT_INLINE 
+# define XBT_INLINE 
 #endif
 
 

diff --git a/include/xbt/swag.h b/include/xbt/swag.h
index 9956825..caa54e5 100644 (file)
--- a/include/xbt/swag.h
+++ b/include/xbt/swag.h
@@ -97,7 +97,7 @@ void *xbt_swag_extract(xbt_swag_t swag);
 int xbt_swag_size(xbt_swag_t swag);
 int xbt_swag_belongs(void *obj, xbt_swag_t swag);
 
-static _XBT_INLINE void *xbt_swag_getFirst(xbt_swag_t swag)
+static XBT_INLINE void *xbt_swag_getFirst(xbt_swag_t swag)
 {
   return (swag->head);
 }

diff --git a/src/gras/DataDesc/ddt_exchange.c b/src/gras/DataDesc/ddt_exchange.c
index 091654f..8a4f148 100644 (file)
--- a/src/gras/DataDesc/ddt_exchange.c
+++ b/src/gras/DataDesc/ddt_exchange.c
@@ -63,7 +63,7 @@ gras_dd_recv_int(gras_socket_t sock, int r_arch, int *i) {
  *       of 'length' bytes set to 0.
  * FIXME: Check in configure?
  */
-static _XBT_INLINE int 
+static XBT_INLINE int 
 gras_dd_is_r_null(char **r_ptr, long int length) {
   int i;
 
@@ -76,7 +76,7 @@ gras_dd_is_r_null(char **r_ptr, long int length) {
   return 1;
 }
 
-static _XBT_INLINE void
+static XBT_INLINE void
 gras_dd_alloc_ref(xbt_dict_t  refs,
                  long int     size,
                  char       **r_ref,

diff --git a/src/include/surf/maxmin.h b/src/include/surf/maxmin.h
index 5d9f7a0..27ce18d 100644 (file)
--- a/src/include/surf/maxmin.h
+++ b/src/include/surf/maxmin.h
@@ -10,7 +10,7 @@
 
 #include "xbt/misc.h"
 
-static _XBT_INLINE void double_update(double *variable, double value) 
+static XBT_INLINE void double_update(double *variable, double value) 
 {
   *variable -= value;
   if(*variable< 0.00001) *variable = 0.0;

diff --git a/src/simdag/private.h b/src/simdag/private.h
index 1fa4e29..bd3c2ce 100644 (file)
--- a/src/simdag/private.h
+++ b/src/simdag/private.h
@@ -116,39 +116,39 @@ void __SD_task_just_done(SD_task_t task);
 /* Functions to test if the task is in a given state. */
 
 /* Returns whether the given task is scheduled or ready. */
-static _XBT_INLINE int __SD_task_is_scheduled_or_ready(SD_task_t task) {
+static XBT_INLINE int __SD_task_is_scheduled_or_ready(SD_task_t task) {
   return task->state_set == sd_global->scheduled_task_set ||
     task->state_set == sd_global->ready_task_set;
 }
 
 /* Returns whether the state of the given task is SD_NOT_SCHEDULED. */
-static _XBT_INLINE int __SD_task_is_not_scheduled(SD_task_t task) {
+static XBT_INLINE int __SD_task_is_not_scheduled(SD_task_t task) {
   return task->state_set == sd_global->not_scheduled_task_set;
 }
 
 /* Returns whether the state of the given task is SD_SCHEDULED. */
-static _XBT_INLINE int __SD_task_is_scheduled(SD_task_t task) {
+static XBT_INLINE int __SD_task_is_scheduled(SD_task_t task) {
   return task->state_set == sd_global->scheduled_task_set;
 }
 
 /* Returns whether the state of the given task is SD_READY. */
-static _XBT_INLINE int __SD_task_is_ready(SD_task_t task) {
+static XBT_INLINE int __SD_task_is_ready(SD_task_t task) {
   return task->state_set == sd_global->ready_task_set;
 }
 
 /* Returns whether the state of the given task is SD_IN_FIFO. */
-static _XBT_INLINE int __SD_task_is_in_fifo(SD_task_t task) {
+static XBT_INLINE int __SD_task_is_in_fifo(SD_task_t task) {
   return task->state_set == sd_global->in_fifo_task_set;
 }
 
 /* Returns whether the state of the given task is SD_READY or SD_IN_FIFO. */
-static _XBT_INLINE int __SD_task_is_ready_or_in_fifo(SD_task_t task) {
+static XBT_INLINE int __SD_task_is_ready_or_in_fifo(SD_task_t task) {
   return task->state_set == sd_global->ready_task_set ||
     task->state_set == sd_global->in_fifo_task_set;
 }
 
 /* Returns whether the state of the given task is SD_RUNNING. */
-static _XBT_INLINE int __SD_task_is_running(SD_task_t task) {
+static XBT_INLINE int __SD_task_is_running(SD_task_t task) {
   return task->state_set == sd_global->running_task_set;
 }
 

diff --git a/src/xbt/dict_cursor.c b/src/xbt/dict_cursor.c
index 6541118..de99ef2 100644 (file)
--- a/src/xbt/dict_cursor.c
+++ b/src/xbt/dict_cursor.c
@@ -58,7 +58,7 @@ void xbt_dict_cursor_free(xbt_dict_cursor_t *cursor) {
 /*
  * Sanity check to see if the head contains something
  */
-static _XBT_INLINE void __cursor_not_null(xbt_dict_cursor_t cursor) {
+static XBT_INLINE void __cursor_not_null(xbt_dict_cursor_t cursor) {
   xbt_assert0(cursor, "Null cursor");
 }
 

diff --git a/src/xbt/dynar.c b/src/xbt/dynar.c
index 5cfc493..2c1e7dc 100644 (file)
--- a/src/xbt/dynar.c
+++ b/src/xbt/dynar.c
@@ -40,13 +40,13 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dyn,xbt,"Dynamic arrays");
            xbt_assert1(dynar->used,              \
                        "dynar %p contains nothing",(void*)dynar)
 
-static _XBT_INLINE 
+static XBT_INLINE 
 void _xbt_clear_mem(void * const ptr,
                     const unsigned long length) {
   memset(ptr, 0, length);
 }
 
-static _XBT_INLINE
+static XBT_INLINE
 void
 _xbt_dynar_expand(xbt_dynar_t const dynar,
                    const int          nb) {
@@ -80,7 +80,7 @@ _xbt_dynar_expand(xbt_dynar_t const dynar,
   }
 }
 
-static _XBT_INLINE
+static XBT_INLINE
 void *
 _xbt_dynar_elm(const xbt_dynar_t  dynar,
                const unsigned long idx) {
@@ -90,7 +90,7 @@ _xbt_dynar_elm(const xbt_dynar_t  dynar,
   return data + idx*elmsize;
 }
 
-static _XBT_INLINE
+static XBT_INLINE
 void
 _xbt_dynar_get_elm(void  * const       dst,
                     const xbt_dynar_t  dynar,
@@ -100,7 +100,7 @@ _xbt_dynar_get_elm(void  * const       dst,
   memcpy(dst, elm, dynar->elmsize);
 }
 
-static _XBT_INLINE
+static XBT_INLINE
 void
 _xbt_dynar_put_elm(const xbt_dynar_t  dynar,
                     const unsigned long idx,