[gimp] libgimpbase: s/LIBGIMP_COMPILATION/GIMP_BASE_COMPILATION/ in gimpenv.*
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] libgimpbase: s/LIBGIMP_COMPILATION/GIMP_BASE_COMPILATION/ in gimpenv.*
- Date: Thu, 28 Apr 2011 17:35:27 +0000 (UTC)
commit 2337d44018731d231768b27ee2fab16a40dbf6e7
Author: Michael Natterer <mitch gimp org>
Date: Thu Apr 28 19:34:22 2011 +0200
libgimpbase: s/LIBGIMP_COMPILATION/GIMP_BASE_COMPILATION/ in gimpenv.*
because the latter is now generically defined for the new include guards.
libgimpbase/gimpenv.c | 4 ----
libgimpbase/gimpenv.h | 12 ++++++------
2 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/libgimpbase/gimpenv.c b/libgimpbase/gimpenv.c
index aa33478..e00baaf 100644
--- a/libgimpbase/gimpenv.c
+++ b/libgimpbase/gimpenv.c
@@ -31,10 +31,6 @@
#include <glib-object.h>
#include <glib/gstdio.h>
-#ifndef LIBGIMP_COMPILATION
-#define LIBGIMP_COMPILATION
-#endif
-
#undef GIMP_DISABLE_DEPRECATED
#include "gimpbasetypes.h"
diff --git a/libgimpbase/gimpenv.h b/libgimpbase/gimpenv.h
index d9e1e2a..deeda35 100644
--- a/libgimpbase/gimpenv.h
+++ b/libgimpbase/gimpenv.h
@@ -23,8 +23,8 @@
#error "Only <libgimpbase/gimpbase.h> can be included directly."
#endif
-#ifndef __GIMPENV_H__
-#define __GIMPENV_H__
+#ifndef __GIMP_ENV_H__
+#define __GIMP_ENV_H__
G_BEGIN_DECLS
@@ -33,11 +33,11 @@ G_BEGIN_DECLS
#ifdef G_OS_WIN32
-# ifdef LIBGIMP_COMPILATION
+# ifdef GIMP_BASE_COMPILATION
# define GIMPVAR __declspec(dllexport)
-# else /* !LIBGIMP_COMPILATION */
+# else /* !GIMP_BASE_COMPILATION */
# define GIMPVAR extern __declspec(dllimport)
-# endif /* !LIBGIMP_COMPILATION */
+# endif /* !GIMP_BASE_COMPILATION */
#else /* !G_OS_WIN32 */
# define GIMPVAR extern
#endif
@@ -76,4 +76,4 @@ void gimp_env_init (gboolean plug_in);
G_END_DECLS
-#endif /* __GIMPENV_H__ */
+#endif /* __GIMP_ENV_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]