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

List:       kde-commits
Subject:    KDE/kdelibs
From:       Allen Winter <winter () kde ! org>
Date:       2007-04-01 2:07:31
Message-ID: 1175393251.942632.14162.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 648696 by winterz:

kross_export.h


 M  +0 -1      kdelibs_export.h  
 M  +0 -8      kdelibs_export_win.h  
 M  +1 -0      kross/core/CMakeLists.txt  
 A             kross/core/kross_export.h   [License: LGPL (v2+)]
 M  +1 -27     kross/core/krossconfig.h  


--- trunk/KDE/kdelibs/kdelibs_export.h #648695:648696
@@ -36,7 +36,6 @@
 /* export statements for unix */
 #define KNTLM_EXPORT KDE_EXPORT
 #define KUNITTEST_EXPORT KDE_EXPORT
-#define KROSSCORE_EXPORT KDE_EXPORT
 
 #define KIOSLAVE_FILE_EXPORT KDE_EXPORT
 
--- trunk/KDE/kdelibs/kdelibs_export_win.h #648695:648696
@@ -43,14 +43,6 @@
 # endif
 #endif
 
-#ifndef KROSSCORE_EXPORT
-# ifdef MAKE_KROSSCORE_LIB
-#  define KROSSCORE_EXPORT KDE_EXPORT
-# else
-#  define KROSSCORE_EXPORT KDE_IMPORT
-# endif
-#endif
-
 #ifndef _CRT_SECURE_NO_DEPRECATE
 #define _CRT_SECURE_NO_DEPRECATE
 #endif
--- trunk/KDE/kdelibs/kross/core/CMakeLists.txt #648695:648696
@@ -32,6 +32,7 @@
 ########### install files ###############
 
 install( FILES 
+    kross_export.h
     krossconfig.h 
     errorinterface.h 
     childreninterface.h 
--- trunk/KDE/kdelibs/kross/core/krossconfig.h #648695:648696
@@ -20,37 +20,11 @@
 #ifndef KROSS_MAIN_KROSSCONFIG_H
 #define KROSS_MAIN_KROSSCONFIG_H
 
+#include <kross/core/kross_export.h>
 #include <QString>
-#include <kdemacros.h>
 
 namespace Kross {
 
-    // define the KROSS_EXPORT and KROSSCORE_EXPORT macros
-    #ifdef Q_WS_WIN
-        #ifndef KROSSCORE_EXPORT
-        # ifdef MAKE_KROSSCORE_LIB
-        #  define KROSSCORE_EXPORT KDE_EXPORT
-        # elif KDE_MAKE_LIB
-        #  define KROSSCORE_EXPORT KDE_IMPORT
-        # else
-        #  define KROSSCORE_EXPORT
-        # endif
-        #endif
-
-        #ifndef KROSS_EXPORT
-        # ifdef MAKE_KROSS_LIB
-        #  define KROSS_EXPORT KDE_EXPORT
-        # elif KDE_MAKE_LIB
-        #  define KROSS_EXPORT KDE_IMPORT
-        # else
-        #  define KROSS_EXPORT
-        # endif
-        #endif
-    #else
-        #define KROSS_EXPORT KDE_EXPORT
-        #define KROSSCORE_EXPORT KDE_EXPORT
-    #endif
-
     // Debugging enabled. Comment the line out to disable all kind of debugging.
     #define KROSS_DEBUG_ENABLED
 
[prev in list] [next in list] [prev in thread] [next in thread]