From: mquinson Date: Thu, 8 Sep 2005 22:07:59 +0000 (+0000) Subject: Rename BEGIN_DECL since we changed the usual definition to a macro with arguments... X-Git-Tag: v3.3~3645 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/494616a1d79ab04ce6f0309a5cbb29ee5876c379?ds=sidebyside Rename BEGIN_DECL since we changed the usual definition to a macro with arguments (since the usual version did fool doxygen) git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1712 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/include/gras/datadesc.h b/include/gras/datadesc.h index 3ac22b8ddc..31a4e3604a 100644 --- a/include/gras/datadesc.h +++ b/include/gras/datadesc.h @@ -10,10 +10,10 @@ #ifndef GRAS_DATADESC_H #define GRAS_DATADESC_H -#include "xbt/misc.h" /* BEGIN_DECL */ +#include "xbt/misc.h" /* SG_BEGIN_DECL */ #include "xbt/dynar.h" /* void_f_pvoid_t */ -BEGIN_DECL() +SG_BEGIN_DECL() /** @addtogroup GRAS_dd Data description * @brief Describing data to be exchanged (Communication facility) @@ -382,6 +382,6 @@ gras_datadesc_import_nws(const char *name, unsigned long howmany); -END_DECL() +SG_END_DECL() #endif /* GRAS_DATADESC_H */ diff --git a/include/gras/emul.h b/include/gras/emul.h index 4d8eb83eaa..a1835095ed 100644 --- a/include/gras/emul.h +++ b/include/gras/emul.h @@ -11,9 +11,9 @@ #ifndef GRAS_COND_H #define GRAS_COND_H -#include "xbt/misc.h" /* BEGIN_DECL */ +#include "xbt/misc.h" /* SG_BEGIN_DECL */ -BEGIN_DECL() +SG_BEGIN_DECL() /** @addtogroup GRAS_emul * @brief Code execution "emulation" and "virtualization". @@ -167,7 +167,7 @@ int gras_bench_once_end(void); #define GRAS_BENCH_ONCE_RUN_ONCE_END() } gras_bench_once_end() /** @} */ -END_DECL() +SG_END_DECL() #endif /* GRAS_COND_H */ diff --git a/include/gras/messages.h b/include/gras/messages.h index 5a8d95a1f1..d704834354 100644 --- a/include/gras/messages.h +++ b/include/gras/messages.h @@ -15,7 +15,7 @@ #include "gras/transport.h" #include "gras/datadesc.h" -BEGIN_DECL() +SG_BEGIN_DECL() /** @addtogroup GRAS_msg * @brief Defining messages and callbacks, and exchanging messages (Communication facility) @@ -115,7 +115,7 @@ typedef struct s_gras_msgtype *gras_msgtype_t; /* @} */ -END_DECL() +SG_END_DECL() #endif /* GRAS_MSG_H */ diff --git a/include/gras/process.h b/include/gras/process.h index 30dd5a3bf2..15dd07fa15 100644 --- a/include/gras/process.h +++ b/include/gras/process.h @@ -10,9 +10,9 @@ #ifndef GRAS_PROCESS_H #define GRAS_PROCESS_H -#include "xbt/misc.h" /* BEGIN_DECL */ +#include "xbt/misc.h" /* SG_BEGIN_DECL */ -BEGIN_DECL() +SG_BEGIN_DECL() /* ************************************************************************** * Initializing the processes @@ -65,7 +65,7 @@ void gras_userdata_set(void *ud); #define gras_userdata_new(type) (gras_userdata_set(xbt_new0(type,1)),gras_userdata_get()) /* @} */ -END_DECL() +SG_END_DECL() #endif /* GRAS_PROCESS_H */ diff --git a/include/gras/timer.h b/include/gras/timer.h index 8c5e418e14..f12c599233 100644 --- a/include/gras/timer.h +++ b/include/gras/timer.h @@ -13,7 +13,7 @@ #include "xbt/misc.h" -BEGIN_DECL() +SG_BEGIN_DECL() /** @addtogroup GRAS_timer * @brief Delayed and repetitive tasks (Communication facility) @@ -52,6 +52,6 @@ BEGIN_DECL() /** @} */ -END_DECL() +SG_END_DECL() #endif /* GRAS_TIMER_H */ diff --git a/include/gras/virtu.h b/include/gras/virtu.h index aab294e0e5..2eb87e561c 100644 --- a/include/gras/virtu.h +++ b/include/gras/virtu.h @@ -10,9 +10,9 @@ #ifndef GRAS_VIRTU_H #define GRAS_VIRTU_H -#include "xbt/misc.h" /* BEGIN_DECL */ +#include "xbt/misc.h" /* SG_BEGIN_DECL */ -BEGIN_DECL() +SG_BEGIN_DECL() /** @addtogroup GRAS_virtu * @brief System call abstraction layer (Virtualization). @@ -47,7 +47,7 @@ gras_os_myname(void); int gras_os_getpid(void); /** @} */ -END_DECL() +SG_END_DECL() #endif /* GRAS_VIRTU_H */ diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h index 8034f9fece..116dbd1bdc 100644 --- a/include/msg/datatypes.h +++ b/include/msg/datatypes.h @@ -9,7 +9,7 @@ #define MSG_DATATYPE_H #include "xbt/misc.h" -BEGIN_DECL() +SG_BEGIN_DECL() /* ******************************** Host ************************************ */ /** @defgroup m_datatypes_management_details */ @@ -124,5 +124,5 @@ typedef enum { } MSG_error_t; /** @} */ -END_DECL() +SG_END_DECL() #endif diff --git a/include/msg/msg.h b/include/msg/msg.h index 33f4ce0425..84552645ad 100644 --- a/include/msg/msg.h +++ b/include/msg/msg.h @@ -11,8 +11,9 @@ #include "xbt/misc.h" #include "xbt/sysdep.h" -BEGIN_DECL() #include "msg/datatypes.h" +SG_BEGIN_DECL() + /************************** Global ******************************************/ void MSG_config(const char *name, ...); @@ -111,5 +112,5 @@ double MSG_task_get_compute_duration(m_task_t task); double MSG_task_get_remaining_computation(m_task_t task); double MSG_task_get_data_size(m_task_t task); -END_DECL() +SG_END_DECL() #endif diff --git a/include/xbt/asserts.h b/include/xbt/asserts.h index 9e1a7aa155..ac757041b2 100644 --- a/include/xbt/asserts.h +++ b/include/xbt/asserts.h @@ -11,7 +11,7 @@ #include "xbt/misc.h" -BEGIN_DECL() +SG_BEGIN_DECL() /** * \addtogroup XBT_error @@ -51,6 +51,6 @@ void xbt_die(const char *msg) _XBT_GNUC_NORETURN; /** @} */ -END_DECL() +SG_END_DECL() #endif /* _XBT_ASSERTS_H */ diff --git a/include/xbt/config.h b/include/xbt/config.h index fa317a41e4..dfd08b24e7 100644 --- a/include/xbt/config.h +++ b/include/xbt/config.h @@ -14,7 +14,7 @@ #include "xbt/dynar.h" -BEGIN_DECL() +SG_BEGIN_DECL() /** @addtogroup XBT_config * @@ -197,6 +197,6 @@ void xbt_cfg_empty(xbt_cfg_t cfg, const char *name); /** @} */ /** @} */ -END_DECL() +SG_END_DECL() #endif /* _XBT_CONFIG_H_ */ diff --git a/include/xbt/dict.h b/include/xbt/dict.h index 395f53e9bd..3c0f80ea36 100644 --- a/include/xbt/dict.h +++ b/include/xbt/dict.h @@ -11,10 +11,10 @@ #ifndef _XBT_DICT_H #define _XBT_DICT_H -#include "xbt/misc.h" /* BEGIN_DECL */ +#include "xbt/misc.h" /* SG_BEGIN_DECL */ #include "xbt/dynar.h" /* void_f_pvoid_t */ -BEGIN_DECL() +SG_BEGIN_DECL() /** @addtogroup XBT_dict * @@ -168,6 +168,6 @@ void xbt_multidict_remove_ext(xbt_dict_t mdict, xbt_dynar_t keys, xbt_dynar_t le /** @} */ /** @} */ -END_DECL() +SG_END_DECL() #endif /* _XBT_DICT_H */ diff --git a/include/xbt/dynar.h b/include/xbt/dynar.h index d9f599bc39..90c5fe4134 100644 --- a/include/xbt/dynar.h +++ b/include/xbt/dynar.h @@ -10,9 +10,9 @@ #ifndef _XBT_DYNAR_H #define _XBT_DYNAR_H -#include "xbt/misc.h" /* BEGIN_DECL */ +#include "xbt/misc.h" /* SG_BEGIN_DECL */ -BEGIN_DECL() +SG_BEGIN_DECL() /** \addtogroup XBT_dynar * @@ -176,7 +176,7 @@ xbt_dynar_foreach (dyn,cpt,str) { xbt_dynar_cursor_step(_dynar,&(_cursor)) ) -END_DECL() +SG_END_DECL() /* @} */ #endif /* _XBT_DYNAR_H */ diff --git a/include/xbt/fifo.h b/include/xbt/fifo.h index 01dfbff770..004db05ddf 100644 --- a/include/xbt/fifo.h +++ b/include/xbt/fifo.h @@ -7,9 +7,9 @@ #ifndef _XBT_FIFO_H #define _XBT_FIFO_H -#include "xbt/misc.h" /* BEGIN_DECL */ +#include "xbt/misc.h" /* SG_BEGIN_DECL */ -BEGIN_DECL() +SG_BEGIN_DECL() /** \addtogroup XBT_fifo * @{ */ @@ -100,7 +100,7 @@ xbt_fifo_item_t xbt_fifo_getNextItem(xbt_fifo_item_t i); xbt_fifo_item_t xbt_fifo_getPrevItem(xbt_fifo_item_t i); /** @} */ -END_DECL() +SG_END_DECL() /** @} */ #endif /* _XBT_FIFO_H */ diff --git a/include/xbt/misc.h b/include/xbt/misc.h index 0a97552880..28428682d8 100644 --- a/include/xbt/misc.h +++ b/include/xbt/misc.h @@ -57,25 +57,25 @@ #define XBT_MAX_CHANNEL 10 /* FIXME: killme */ /*! C++ users need love */ -#ifndef BEGIN_DECL +#ifndef SG_BEGIN_DECL # ifdef __cplusplus -# define BEGIN_DECL() extern "C" { +# define SG_BEGIN_DECL() extern "C" { # else -# define BEGIN_DECL() +# define SG_BEGIN_DECL() # endif #endif /*! C++ users need love */ -#ifndef END_DECL +#ifndef SG_END_DECL # ifdef __cplusplus -# define END_DECL() } +# define SG_END_DECL() } # else -# define END_DECL() +# define SG_END_DECL() # endif #endif /* End of cruft for C++ */ -BEGIN_DECL() +SG_BEGIN_DECL() /* Dunno where to place this: needed by config and amok */ typedef struct { char *name; @@ -84,6 +84,6 @@ typedef struct { const char *xbt_procname(void); -END_DECL() +SG_END_DECL() #endif /* XBT_MISC_H */ diff --git a/include/xbt/set.h b/include/xbt/set.h index 726efad138..47a4cc47fe 100644 --- a/include/xbt/set.h +++ b/include/xbt/set.h @@ -10,9 +10,9 @@ #ifndef _XBT_SET_H #define _XBT_SET_H -#include "xbt/misc.h" /* BEGIN_DECL */ +#include "xbt/misc.h" /* SG_BEGIN_DECL */ -BEGIN_DECL() +SG_BEGIN_DECL() /** @addtogroup XBT_set * @@ -91,6 +91,6 @@ int xbt_set_cursor_get_or_free (xbt_set_cursor_t *cursor, /* @} */ /* @} */ -END_DECL() +SG_END_DECL() #endif /* _XBT_SET_H */ diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h index e6bec9d90b..2c7c194f52 100644 --- a/include/xbt/sysdep.h +++ b/include/xbt/sysdep.h @@ -19,7 +19,7 @@ #include "xbt/misc.h" #include "xbt/asserts.h" -BEGIN_DECL() +SG_BEGIN_DECL() /** @addtogroup XBT_syscall * @{ @@ -98,6 +98,6 @@ static inline void *xbt_realloc(void*p,int s){ int vasprintf (char **ptr, const char *fmt, va_list ap); char *bprintf(const char*fmt, ...) _XBT_GNUC_PRINTF(1,2); -END_DECL() +SG_END_DECL() #endif /* _XBT_SYSDEP_H */