From: cherierm Date: Wed, 7 Feb 2007 15:08:51 +0000 (+0000) Subject: a default X-Git-Tag: v3.3~2264 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/176970c7aea6df41b3673e938fbb6a5912982268 a default git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3095 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/include/xbt/config.h b/include/xbt/config.h index 8c0e9af981..05e49ebc14 100644 --- a/include/xbt/config.h +++ b/include/xbt/config.h @@ -152,7 +152,7 @@ XBT_PUBLIC(void) xbt_cfg_empty(xbt_cfg_t cfg, const char *name); /** \brief Callback types. They get the name of the modified entry, and the position of the changed value */ typedef void (*xbt_cfg_cb_t)(const char*, int); - XBT_PUBLIC xbt_cfg_t xbt_cfg_new (void); + XBT_PUBLIC(xbt_cfg_t) xbt_cfg_new (void); XBT_PUBLIC(void) xbt_cfg_cpy(xbt_cfg_t tocopy, /* OUT */ xbt_cfg_t *whereto); XBT_PUBLIC(void) xbt_cfg_free(xbt_cfg_t *cfg); XBT_PUBLIC(void) xbt_cfg_dump(const char *name,const char*indent,xbt_cfg_t cfg); @@ -174,7 +174,7 @@ XBT_PUBLIC(void) xbt_cfg_empty(xbt_cfg_t cfg, const char *name); XBT_PUBLIC(void) xbt_cfg_unregister(xbt_cfg_t cfg, const char *name); XBT_PUBLIC(void) xbt_cfg_register_str(xbt_cfg_t cfg, const char *entry); XBT_PUBLIC(void) xbt_cfg_check(xbt_cfg_t cfg); - XBT_PUBLIC e_xbt_cfgelm_type_t xbt_cfg_get_type(xbt_cfg_t cfg, const char *name); + XBT_PUBLIC(e_xbt_cfgelm_type_t) xbt_cfg_get_type(xbt_cfg_t cfg, const char *name); /* @} */ /** @defgroup XBT_cfg_get Getting the stored values * @ingroup XBT_config diff --git a/include/xbt/dict.h b/include/xbt/dict.h index 2d013010a3..6f9c0763e8 100644 --- a/include/xbt/dict.h +++ b/include/xbt/dict.h @@ -107,7 +107,7 @@ SG_BEGIN_DECL() /** @brief Cursor on dictionnaries (opaque type) */ typedef struct xbt_dict_cursor_ *xbt_dict_cursor_t; - XBT_PUBLIC xbt_dict_cursor_t xbt_dict_cursor_new(const xbt_dict_t dict); + XBT_PUBLIC(xbt_dict_cursor_t) xbt_dict_cursor_new(const xbt_dict_t dict); XBT_PUBLIC(void) xbt_dict_cursor_free(xbt_dict_cursor_t *cursor); XBT_PUBLIC(void) xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor); diff --git a/include/xbt/dynar.h b/include/xbt/dynar.h index 52ea05c8ba..3a07da135e 100644 --- a/include/xbt/dynar.h +++ b/include/xbt/dynar.h @@ -62,13 +62,13 @@ SG_BEGIN_DECL() typedef struct xbt_dynar_s *xbt_dynar_t; - XBT_PUBLIC xbt_dynar_t xbt_dynar_new(unsigned long elm_size, + XBT_PUBLIC(xbt_dynar_t) xbt_dynar_new(unsigned long elm_size, void_f_pvoid_t *free_func); XBT_PUBLIC(void) xbt_dynar_free(xbt_dynar_t *dynar); XBT_PUBLIC(void) xbt_dynar_free_voidp(void *dynar); XBT_PUBLIC(void) xbt_dynar_free_container(xbt_dynar_t *dynar); - XBT_PUBLIC unsigned long xbt_dynar_length(const xbt_dynar_t dynar); + XBT_PUBLIC(unsigned long) xbt_dynar_length(const xbt_dynar_t dynar); XBT_PUBLIC(void) xbt_dynar_reset(xbt_dynar_t dynar); XBT_PUBLIC(void) xbt_dynar_shrink(xbt_dynar_t dynar, int empty_slots); diff --git a/include/xbt/ex.h b/include/xbt/ex.h index 86830754f0..4586d76efc 100644 --- a/include/xbt/ex.h +++ b/include/xbt/ex.h @@ -230,7 +230,7 @@ typedef struct { __ex_mctx_struct } __ex_mctx_t; */ /* we need this symbol here, even if it breaks a bit the module separation */ -XBT_PUBLIC long int gras_os_getpid(void); +XBT_PUBLIC(long) int gras_os_getpid(void); /** @brief different kind of errors */ typedef enum { @@ -245,7 +245,7 @@ typedef enum { thread_error /**< error while [un]locking */ } xbt_errcat_t; -XBT_PUBLIC const char * xbt_ex_catname(xbt_errcat_t cat); +XBT_PUBLIC(const char *) xbt_ex_catname(xbt_errcat_t cat); /** @brief Structure describing an exception */ typedef struct { diff --git a/include/xbt/fifo.h b/include/xbt/fifo.h index 15d9c951d9..dacb28afc3 100644 --- a/include/xbt/fifo.h +++ b/include/xbt/fifo.h @@ -55,7 +55,7 @@ XBT_PUBLIC(int) xbt_fifo_is_in(xbt_fifo_t, void *); * @{ */ -XBT_PUBLIC xbt_fifo_item_t xbt_fifo_new_item(void); +XBT_PUBLIC(xbt_fifo_item_t) xbt_fifo_new_item(void); XBT_PUBLIC(void) xbt_fifo_set_item_content(xbt_fifo_item_t, void *); XBT_PUBLIC(void*) xbt_fifo_get_item_content(xbt_fifo_item_t); XBT_PUBLIC(void) xbt_fifo_free_item(xbt_fifo_item_t); diff --git a/src/include/xbt/xbt_portability.h b/src/include/xbt/xbt_portability.h index 19d72bb0c3..d04d6738bd 100644 --- a/src/include/xbt/xbt_portability.h +++ b/src/include/xbt/xbt_portability.h @@ -20,7 +20,7 @@ XBT_PUBLIC(double) xbt_os_time(void); typedef struct s_xbt_os_timer *xbt_os_timer_t; -XBT_PUBLIC xbt_os_timer_t xbt_os_timer_new(void); +XBT_PUBLIC(xbt_os_timer_t) xbt_os_timer_new(void); XBT_PUBLIC(void) xbt_os_timer_free(xbt_os_timer_t timer); XBT_PUBLIC(void) xbt_os_timer_start(xbt_os_timer_t timer); XBT_PUBLIC(void) xbt_os_timer_stop(xbt_os_timer_t timer);