[gimp/gimp-2-10] libgimpbase: avoid double definition of exported variables on Windows



commit fb40d37bced22f136302262b559ed5c8f29085f4
Author: Ell <ell_se yahoo com>
Date:   Wed Jun 10 18:16:29 2020 +0300

    libgimpbase: avoid double definition of exported variables on Windows
    
    ... by qualifying them with "extern", in addition to
    "__declspec(dllexport)".  Omitting "extern" happened to work in the
    past, but recent GCC versions require it.
    
    (cherry picked from commit b2e223813bbcf862d0cce4c7a94a60a9d4e73e7a)

 libgimpbase/gimpenv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/libgimpbase/gimpenv.h b/libgimpbase/gimpenv.h
index 4a7506a6c7..04a83af29b 100644
--- a/libgimpbase/gimpenv.h
+++ b/libgimpbase/gimpenv.h
@@ -34,7 +34,7 @@ G_BEGIN_DECLS
 
 #ifdef G_OS_WIN32
 #  ifdef __GIMP_ENV_C__
-#    define GIMPVAR __declspec(dllexport)
+#    define GIMPVAR extern __declspec(dllexport)
 #  else  /* !__GIMP_ENV_C__ */
 #    define GIMPVAR extern __declspec(dllimport)
 #  endif /* !__GIMP_ENV_C__ */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]