Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / src / include / simgrid / sg_config.h

diff --git a/src/include/simgrid/sg_config.h b/src/include/simgrid/sg_config.h
index 3d01e63..7d8410e 100644 (file)
--- a/src/include/simgrid/sg_config.h
+++ b/src/include/simgrid/sg_config.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2013. The SimGrid Team.
+/* Copyright (c) 2012-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -10,23 +10,19 @@
 /*** Config Globals **************************/
 /*******************************************/
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+SG_BEGIN_DECL()
 
 XBT_PUBLIC_DATA(xbt_cfg_t) _sg_cfg_set;
 XBT_PUBLIC_DATA(int) _sg_cfg_init_status;
 XBT_PUBLIC_DATA(int) _sg_cfg_exit_asap;
+XBT_PUBLIC(int) sg_cfg_is_default_value(const char* name);
 XBT_PUBLIC(int) sg_cfg_get_int(const char* name);
 XBT_PUBLIC(double) sg_cfg_get_double(const char* name);
 XBT_PUBLIC(char*) sg_cfg_get_string(const char* name);
 XBT_PUBLIC(int) sg_cfg_get_boolean(const char* name);
-XBT_PUBLIC(void) sg_cfg_get_peer(const char *name, char **peer, int *port);
 XBT_PUBLIC(xbt_dynar_t) sg_cfg_get_dynar(const char* name);
 
-void sg_config_init(int *argc, char **argv);
-void sg_config_finalize(void);
+XBT_PUBLIC(void) sg_config_init(int *argc, char **argv);
+XBT_PUBLIC(void) sg_config_finalize(void);
 
-#ifdef __cplusplus
-}
-#endif
+SG_END_DECL()