From d1132e28fb4848470655f287c13a0c4ecf549872 Mon Sep 17 00:00:00 2001 From: mquinson Date: Wed, 14 Mar 2007 09:11:43 +0000 Subject: [PATCH] Rename XBT_DECLARE_DATA to XBT_PUBLIC_DATA for sake of consistency, and rewrite its usage to be consistant with XBT_PUBLIC git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3263 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- include/xbt/misc.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/xbt/misc.h b/include/xbt/misc.h index cbfd518e71..5f0cd7ba2b 100644 --- a/include/xbt/misc.h +++ b/include/xbt/misc.h @@ -115,28 +115,28 @@ # 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_DECLARE_DATA __declspec(dllexport) +# define XBT_PUBLIC_DATA(type) type __declspec(dllexport) /* Pack everything up statically */ #elif defined(DLL_STATIC) # define XBT_PUBLIC(type) type # define XBT_EXPORT_NO_IMPORT(type) type # define XBT_IMPORT_NO_EXPORT(type) type -# define XBT_DECLARE_DATA +# define XBT_PUBLIC_DATA(type) type /* Link against the DLL */ #elif (defined(_WIN32) && !defined(DLL_EXPORT)) # 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_DECLARE_DATA __declspec(dllimport) +# define XBT_PUBLIC_DATA(type) type __declspec(dllimport) /* Non-UNIX build. Let's keep sain here ;) */ #else # define XBT_PUBLIC(type) extern type # define XBT_EXPORT_NO_IMPORT(type) type # define XBT_IMPORT_NO_EXPORT(type) type -# define XBT_DECLARE_DATA +# define XBT_PUBLIC_DATA(type) extern type #endif -- 2.20.1