[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    [PATCH] add some more KFOO_EXPORT
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2005-11-06 9:10:19
Message-ID: 436DC87B.2090007 () gmx ! de
[Download RAW message or body]

[Attachment #2 (multipart/mixed)]


Hi,

this patch adds KFOO_EXPORTS for kwallet, dnssd and libkdegames and
cleans up kdelibs_export_win.h a bit.

Wasn't there a discussion to move kdelibs_export_h from kdelibs/kdecore/
into kdelibs/ ?

Christian

["kdecore_kdelibs_export_h.patch" (text/x-diff)]

Index: kdelibs_export.h
===================================================================
--- kdelibs_export.h	(revision 478091)
+++ kdelibs_export.h	(working copy)
@@ -28,7 +28,6 @@
 # include <Qt/qglobal.h>
 #endif
 
-
 #if defined _WIN32 || defined _WIN64
 # include <kdelibs_export_win.h>
 #else /* UNIX */
@@ -59,7 +58,10 @@
 #define KDE_ARTS_EXPORT KDE_EXPORT
 #define KWALLET_EXPORT KDE_EXPORT
 #define KUNITTEST_EXPORT KDE_EXPORT
-#define KJS_EXPORT KDE_EXPORT 
+#define KJS_EXPORT KDE_EXPORT
+#define KWALLET_EXPORT KDE_EXPORT
+#define KDNSSD_EXPORT KDE_EXPORT
+#define KDEGAMES_EXPORT KDE_EXPORT
 
 #define KPATH_SEPARATOR ':'
 

["win.patch" (text/x-diff)]

Index: include/kdelibs_export_win.h
===================================================================
--- include/kdelibs_export_win.h	(revision 478091)
+++ include/kdelibs_export_win.h	(working copy)
@@ -24,18 +24,16 @@
 #define pclose _pclose
 
 #if defined(__MINGW32__)
-#define KDE_IMPORT
+# define KDE_IMPORT
 #else 
-#define KDE_IMPORT __declspec(dllimport)
+# define KDE_IMPORT __declspec(dllimport)
 #endif 
 
 #ifndef KDECORE_EXPORT
 # ifdef MAKE_KDECORE_LIB
 #  define KDECORE_EXPORT KDE_EXPORT
 # else
-#  ifndef KDECORE_EXPORT
-#   define KDECORE_EXPORT KDE_IMPORT //for apps and other libs
-#  endif
+#  define KDECORE_EXPORT KDE_IMPORT //for apps and other libs
 # endif
 #endif
 
@@ -47,28 +45,28 @@
 # endif
 #endif 
 
-/* some classes, i.e. KDock* already use EXPORT_* macro: define it too */
-#ifdef MAKE_KDEUI_LIB
-# define KDEUI_EXPORT KDE_EXPORT
-# define EXPORT_DOCKCLASS KDE_EXPORT
-#elif defined(KDE_MAKE_LIB)
-# define KDEUI_EXPORT KDE_IMPORT
-# define EXPORT_DOCKCLASS KDE_IMPORT /* for library build export docklass by default */
-#else
-# define KDEUI_EXPORT
-# define EXPORT_DOCKCLASS
+#ifndef KDEUI_EXPORT
+# ifdef MAKE_KDEUI_LIB
+#  define KDEUI_EXPORT KDE_EXPORT
+# else
+#  define KDEUI_EXPORT KDE_IMPORT
+# endif
 #endif
 
-#ifdef MAKE_KDEFX_LIB
-# define KDEFX_EXPORT  KDE_EXPORT
-#else
-# define KDEFX_EXPORT KDE_IMPORT
+#ifndef KDEFX_EXPORT
+# ifdef MAKE_KDEFX_LIB
+#  define KDEFX_EXPORT  KDE_EXPORT
+# else
+#  define KDEFX_EXPORT KDE_IMPORT
+# endif
 #endif
 
-#ifdef MAKE_KDEPRINT_LIB
-# define KDEPRINT_EXPORT  KDE_EXPORT
-#else
-# define KDEPRINT_EXPORT KDE_IMPORT
+#ifndef KDEPRINT_EXPORT
+# ifdef MAKE_KDEPRINT_LIB
+#  define KDEPRINT_EXPORT  KDE_EXPORT
+# else
+#  define KDEPRINT_EXPORT KDE_IMPORT
+# endif
 #endif
 
 #ifndef KIO_EXPORT
@@ -79,90 +77,116 @@
 # endif
 #endif
 
-#ifdef MAKE_DCOP_LIB
-# define DCOP_EXPORT KDE_EXPORT
-#else
-# define DCOP_EXPORT KDE_IMPORT
+#ifndef DCOP_EXPORT
+# ifdef MAKE_DCOP_LIB
+#  define DCOP_EXPORT KDE_EXPORT
+# else
+#  define DCOP_EXPORT KDE_IMPORT
+# endif
 #endif
 
-#ifdef MAKE_KPARTS_LIB
-# define KPARTS_EXPORT KDE_EXPORT
-#else
-# define KPARTS_EXPORT KDE_IMPORT
+#ifndef KPARTS_EXPORT
+# ifdef MAKE_KPARTS_LIB
+#  define KPARTS_EXPORT KDE_EXPORT
+# else
+#  define KPARTS_EXPORT KDE_IMPORT
+# endif
 #endif
 
-#ifdef MAKE_KTEXTEDITOR_LIB
-# define KTEXTEDITOR_EXPORT KDE_EXPORT
-#else
-# define KTEXTEDITOR_EXPORT KDE_IMPORT
+#ifndef KTEXTEDITOR_EXPORT
+# ifdef MAKE_KTEXTEDITOR_LIB
+#  define KTEXTEDITOR_EXPORT KDE_EXPORT
+# else
+#  define KTEXTEDITOR_EXPORT KDE_IMPORT
+# endif
 #endif
 
-#ifdef MAKE_KABC_LIB
-# define KABC_EXPORT KDE_EXPORT
-#else
-# define KABC_EXPORT KDE_IMPORT
+#ifndef KABC_EXPORT
+# ifdef MAKE_KABC_LIB
+#  define KABC_EXPORT KDE_EXPORT
+# else
+#  define KABC_EXPORT KDE_IMPORT
+# endif
 #endif
 
-
-#ifdef MAKE_KVCARD_LIB
-# define KVCARD_EXPORT KDE_EXPORT
-#else
-# define KVCARD_EXPORT KDE_IMPORT
+#ifndef KVCARD_EXPORT
+# ifdef MAKE_KVCARD_LIB
+#  define KVCARD_EXPORT KDE_EXPORT
+# else
+#  define KVCARD_EXPORT KDE_IMPORT
+# endif
 #endif
 
-#ifdef MAKE_KRESOURCES_LIB
-# define KRESOURCES_EXPORT KDE_EXPORT
-#else
-# define KRESOURCES_EXPORT KDE_IMPORT
+#ifndef KRESOURCES_EXPORT
+# ifdef MAKE_KRESOURCES_LIB
+#  define KRESOURCES_EXPORT KDE_EXPORT
+# else
+#  define KRESOURCES_EXPORT KDE_IMPORT
+# endif
 #endif
 
-#ifdef MAKE_KDESU_LIB
-# define KDESU_EXPORT KDE_EXPORT
-#else
-# define KDESU_EXPORT KDE_IMPORT
+#ifndef KDESU_EXPORT
+# ifdef MAKE_KDESU_LIB
+#  define KDESU_EXPORT KDE_EXPORT
+# else
+#  define KDESU_EXPORT KDE_IMPORT
+# endif
 #endif
 
-// all KStyle libs
-#ifdef MAKE_KSTYLE_LIB
-# define KSTYLE_EXPORT KDE_EXPORT
-#else
-# define KSTYLE_EXPORT KDE_IMPORT
+#ifndef KSTYLE_EXPORT
+# ifdef MAKE_KSTYLE_LIB
+#  define KSTYLE_EXPORT KDE_EXPORT
+# else
+#  define KSTYLE_EXPORT KDE_IMPORT
+# endif
 #endif
 
-#ifdef MAKE_KMDI_LIB
-# define KMDI_EXPORT  KDE_EXPORT
-#else
-# define KMDI_EXPORT KDE_IMPORT
+#ifndef KMDI_EXPORT
+# ifdef MAKE_KMDI_LIB
+#  define KMDI_EXPORT  KDE_EXPORT
+# else
+#  define KMDI_EXPORT KDE_IMPORT
+# endif
 #endif
 
-#ifdef MAKE_KUTILS_LIB
-# define KUTILS_EXPORT  KDE_EXPORT
-#else
-# define KUTILS_EXPORT KDE_IMPORT
+#ifndef KUTILS_EXPORT
+# ifdef MAKE_KUTILS_LIB
+#  define KUTILS_EXPORT  KDE_EXPORT
+# else
+#  define KUTILS_EXPORT KDE_IMPORT
+# endif
 #endif
 
-#ifdef MAKE_KATEPARTINTERFACES_LIB
-# define KATEPARTINTERFACES_EXPORT  KDE_EXPORT
-#else
-# define KATEPARTINTERFACES_EXPORT KDE_IMPORT
+#ifndef KATEPARTINTERFACES_EXPORT
+# ifdef MAKE_KATEPARTINTERFACES_LIB
+#  define KATEPARTINTERFACES_EXPORT KDE_EXPORT
+# else
+#  define KATEPARTINTERFACES_EXPORT KDE_IMPORT
+# endif
 #endif
 
-#ifdef MAKE_KATEPART_LIB
-# define KATEPART_EXPORT  KDE_EXPORT
-#else
-# define KATEPART_EXPORT KDE_IMPORT
+#ifndef KATEPART_EXPORT
+# ifdef MAKE_KATEPART_LIB
+#  define KATEPART_EXPORT  KDE_EXPORT
+# else
+#  define KATEPART_EXPORT KDE_IMPORT
+# endif
 #endif
 
-#ifdef MAKE_KDE3SUPPORT_LIB
-#define KDE3SUPPORT_EXPORT KDE_EXPORT
-#else
-#define KDE3SUPPORT_EXPORT KDE_IMPORT
+#ifndef KDE3SUPPORT_EXPORT
+# ifdef MAKE_KDE3SUPPORT_LIB
+#  define KDE3SUPPORT_EXPORT KDE_EXPORT
+# else
+#  define KDE3SUPPORT_EXPORT KDE_IMPORT
+# endif
 #endif
 
-#ifdef MAKE_KHTML_LIB
-# define KHTML_EXPORT KDE_EXPORT
-#else
-# define KHTML_EXPORT KDE_IMPORT
+#ifndef KHTML_EXPORT
+# ifdef MAKE_KHTML_LIB
+#  define KHTML_EXPORT KDE_EXPORT
+# else
+#  define KHTML_EXPORT KDE_IMPORT
+# endif
 #endif
 
 #ifndef KICE_EXPORT
@@ -180,3 +204,28 @@
 #  define KJS_EXPORT KDE_IMPORT
 # endif 
 #endif 
+
+#ifndef KWALLET_EXPORT
+# ifdef MAKE_KWALLET_LIB
+#  define KWALLET_EXPORT KDE_EXPORT
+# else
+#  define KWALLET_EXPORT KDE_IMPORT
+# endif 
+#endif 
+
+#ifndef KDNSSD_EXPORT
+# ifdef MAKE_KDNSSD_LIB
+#  define KDNSSD_EXPORT KDE_EXPORT
+# else
+#  define KDNSSD_EXPORT KDE_IMPORT
+# endif
+#endif
+
+#ifndef KDEGAMES_EXPORT
+# ifdef MAKE_KDEGAMES_LIB
+#  define KDEGAMES_EXPORT KDE_EXPORT
+# else
+#  define KDEGAMES_EXPORT KDE_IMPORT
+# endif 
+#endif 
+

["signature.asc" (application/pgp-signature)]

[prev in list] [next in list] [prev in thread] [next in thread]