[From A. Giersch] Fix the following compilation errors in ICO-C99 mode:

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

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index cb1ef33..94900ff 100644 (file)
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -1,10 +1,7 @@
-/* $Id$ */
-
 /* xbt.h - Public interface to the xbt (gras's toolbox)                     */
 
-/* Copyright (c) 2004 Martin Quinson.                                       */
-/* Copyright (c) 2004 Arnaud Legrand.                                       */
-/* All rights reserved.                                                     */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. 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. */
@@ -13,7 +10,7 @@
 #define XBT_MISC_H
 
 /* Attributes are only in recent versions of GCC */
-#if     __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
+#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4))
 # define _XBT_GNUC_PRINTF( format_idx, arg_idx )    \
           __attribute__((__format__ (__printf__, format_idx, arg_idx)))
 # define _XBT_GNUC_SCANF( format_idx, arg_idx )     \
@@ -22,22 +19,28 @@
                   __attribute__((__format_arg__ (arg_idx)))
 # define _XBT_GNUC_NORETURN __attribute__((__noreturn__))
 # define _XBT_GNUC_UNUSED  __attribute__((unused))
+# define _XBT_GNUC_CONSTRUCTOR __attribute__((__constructor__))
+# define _XBT_GNUC_DESTRUCTOR __attribute__((__destructor__))
+# undef _XBT_NEED_INIT_PRAGMA
 
-#else   /* !__GNUC__ */
+#else /* !__GNUC__ */
 # define _XBT_GNUC_PRINTF( format_idx, arg_idx )
 # define _XBT_GNUC_SCANF( format_idx, arg_idx )
 # define _XBT_GNUC_FORMAT( arg_idx )
 # define _XBT_GNUC_NORETURN
 # define _XBT_GNUC_UNUSED
+# define _XBT_GNUC_CONSTRUCTOR
+# define _XBT_GNUC_DESTRUCTOR
+# define  _XBT_NEED_INIT_PRAGMA 1
 
-#endif  /* !__GNUC__ */
+#endif /* !__GNUC__ */
 
 /* inline and __FUNCTION__ are only in GCC when -ansi is off */
 
 #if defined(__GNUC__) && ! defined(__STRICT_ANSI__)
 # define _XBT_FUNCTION __FUNCTION__
 #elif (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
-# define _XBT_FUNC__ __func__      /* ISO-C99 compliant */
+# define _XBT_FUNCTION __func__   /* ISO-C99 compliant */
 #else
 # define _XBT_FUNCTION "function"
 #endif
@@ -52,8 +55,12 @@
 #    else
 #        define XBT_INLINE
 #    endif
-# else
-#    define XBT_INLINE  inline
+#else
+#       if defined (__VISUALC__)
+#              define XBT_INLINE __inline
+#       else
+#      define XBT_INLINE  inline
+#       endif
 #endif
 
 /* improvable on gcc (by evaluating arguments only once), but wouldn't be portable */
@@ -71,12 +78,12 @@
 /* 
  * Function calling convention (not used for now) 
  */
- 
-#ifdef _WIN32
+
+#ifdef _XBT_WIN32
 #  ifndef _XBT_CALL
 #    define _XBT_CALL __cdecl
 #   endif
-#else 
+#else
 #  define _XBT_CALL
 #endif
 
@@ -126,32 +133,31 @@
 #if defined(DLL_EXPORT)
 #  define XBT_PUBLIC(type)            __declspec(dllexport) type
 #  define XBT_EXPORT_NO_IMPORT(type)  __declspec(dllexport) type
-#  define XBT_IMPORT_NO_EXPORT(type)  type 
+#  define XBT_IMPORT_NO_EXPORT(type)  type
 #  define XBT_PUBLIC_DATA(type)              __declspec(dllexport) type
 
 /* Pack everything up statically */
 #elif defined(DLL_STATIC)
-#  define XBT_PUBLIC(type)            type
+#  define XBT_PUBLIC(type)           extern type
 #  define XBT_EXPORT_NO_IMPORT(type)  type
 #  define XBT_IMPORT_NO_EXPORT(type)  type
-#  define XBT_PUBLIC_DATA(type)       type
-     
+#  define XBT_PUBLIC_DATA(type)       extern type
 
 /* Link against the DLL */
-#elif (defined(_WIN32) && !defined(DLL_EXPORT))
+#elif (defined(_XBT_WIN32) && !defined(DLL_EXPORT) && !defined(DLL_STATIC))
 #  define XBT_PUBLIC(type)             __declspec(dllimport) type
 #  define XBT_EXPORT_NO_IMPORT(type)   type
 #  define XBT_IMPORT_NO_EXPORT(type)   __declspec(dllimport) type
 #  define XBT_PUBLIC_DATA(type)                __declspec(dllimport) type
 
-/* UNIX build. Let's keep sain here ;) */
+/* UNIX build */
 #else
 #  define XBT_PUBLIC(type)            extern type
 #  define XBT_EXPORT_NO_IMPORT(type)  type
 #  define XBT_IMPORT_NO_EXPORT(type)  type
-#  define XBT_PUBLIC_DATA(type)       type
+#  define XBT_PUBLIC_DATA(type)       extern type
 #endif
-   
+
 #if !defined (max) && !defined(__cplusplus)
 #  define max(a,b)     (((a) > (b)) ? (a) : (b))
 #endif
@@ -162,13 +168,13 @@
 #define TRUE  1
 #define FALSE 0
 
-#define XBT_MAX_CHANNEL 10 /* FIXME: killme */
+#define XBT_MAX_CHANNEL 10      /* FIXME: killme */
 /*! C++ users need love */
 #ifndef SG_BEGIN_DECL
 # ifdef __cplusplus
 #  define SG_BEGIN_DECL() extern "C" {
 # else
-#  define SG_BEGIN_DECL() 
+#  define SG_BEGIN_DECL()
 # endif
 #endif
 
@@ -176,21 +182,16 @@
 # ifdef __cplusplus
 #  define SG_END_DECL() }
 # else
-#  define SG_END_DECL() 
+#  define SG_END_DECL()
 # endif
 #endif
 /* End of cruft for C++ */
 
 SG_BEGIN_DECL()
 
-XBT_PUBLIC(const char *)xbt_procname(void);
+XBT_PUBLIC(const char *) xbt_procname(void);
 
-#define XBT_BACKTRACE_SIZE 10 /* FIXME: better place? Do document */
-   
-SG_END_DECL()
+#define XBT_BACKTRACE_SIZE 10   /* FIXME: better place? Do document */
 
+SG_END_DECL()
 #endif /* XBT_MISC_H */
-
-
-
-