Merge pull request #302 from mpoquet/rename-s4u-synchro-examples

[simgrid.git] / include / xbt / misc.h

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index 1d17aa2..7af1415 100644 (file)
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -1,7 +1,6 @@
-/* xbt.h - Public interface to the xbt (simgrid's toolbox)                     */
+/* xbt.h - Public interface to the xbt (simgrid's toolbox)                  */
 
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -9,31 +8,25 @@
 #ifndef XBT_MISC_H
 #define XBT_MISC_H
 
-#include "simgrid_config.h"
-#include "base.h"
-#include "dynar.h"
+#include <simgrid/config.h>
+#include <xbt/base.h>
+#include <xbt/dynar.h>
 
 #include <stdarg.h>
 
 SG_BEGIN_DECL()
 
 /** Cache the size of a memory page for the current system. */
-XBT_PUBLIC_DATA(int) xbt_pagesize;
+XBT_PUBLIC_DATA int xbt_pagesize;
 
 /** Cache the number of bits of addresses inside a given page, log2(xbt_pagesize). */
-XBT_PUBLIC_DATA(int) xbt_pagebits;
-
-XBT_PUBLIC(const char *) xbt_procname(void);
-
-/** Retrieves the version numbers of the used dynamic library (so, DLL or dynlib) , while
-    SIMGRID_VERSION_MAJOR and friends give the version numbers of the used header files */
-XBT_PUBLIC(void) sg_version(int *major,int *minor,int *patch);
+XBT_PUBLIC_DATA int xbt_pagebits;
 
 /** Helps ensuring that header version (SIMGRID_VERSION_MAJOR and friends) and dynamic library version do match. */
-XBT_PUBLIC(void) sg_version_check(int lib_version_major,int lib_version_minor,int lib_version_patch);
+XBT_PUBLIC void sg_version_check(int lib_version_major, int lib_version_minor, int lib_version_patch);
 
 /** Contains all the parameters we got from the command line */
-XBT_PUBLIC_DATA(xbt_dynar_t) sg_cmdline;
+XBT_PUBLIC_DATA xbt_dynar_t sg_cmdline;
 
 /* snprintf related functions */
 /** @addtogroup XBT_str
@@ -43,12 +36,12 @@ XBT_PUBLIC_DATA(xbt_dynar_t) sg_cmdline;
  *
  * Similar to vasprintf(), but returns a pointer to the newly created string (or aborts on error).
  */
-XBT_PUBLIC(char *) bvprintf(const char *fmt, va_list ap);
+XBT_PUBLIC char* bvprintf(const char* fmt, va_list ap);
 /** @brief print to allocated string
  *
  * Similar to asprintf(), but returns a pointer to the newly created string (or aborts on error).
  */
-XBT_PUBLIC(char *) bprintf(const char *fmt, ...) XBT_ATTRIB_PRINTF(1, 2);
+XBT_PUBLIC char* bprintf(const char* fmt, ...) XBT_ATTRIB_PRINTF(1, 2);
 /** @} */
 
 SG_END_DECL()