From kde-commits  Sat Mar 31 23:40:19 2007
From: Allen Winter <winter () kde ! org>
Date: Sat, 31 Mar 2007 23:40:19 +0000
To: kde-commits
Subject: KDE/kdelibs
Message-Id: <1175384419.684682.1122.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=117538428817639

SVN commit 648671 by winterz:

kjs_export.h


 M  +0 -4      kdelibs_export.h  
 M  +0 -8      kdelibs_export_win.h  
 M  +1 -0      kjs/CMakeLists.txt  
 M  +1 -1      kjs/JSImmediate.h  
 A             kjs/kjs_export.h   [License: LGPL (v2+)]


--- trunk/KDE/kdelibs/kdelibs_export.h #648670:648671
@@ -38,10 +38,6 @@
 #define KUNITTEST_EXPORT KDE_EXPORT
 #define KROSSCORE_EXPORT KDE_EXPORT
 
-#ifndef KJS_EXPORT
-#define KJS_EXPORT KDE_EXPORT
-#endif
-
 #define KIOSLAVE_FILE_EXPORT KDE_EXPORT
 
 #ifndef O_BINARY
--- trunk/KDE/kdelibs/kdelibs_export_win.h #648670:648671
@@ -27,14 +27,6 @@
 # endif
 #endif
 
-#ifndef KJS_EXPORT
-# ifdef MAKE_KJS_LIB
-#  define KJS_EXPORT KDE_EXPORT
-# else
-#  define KJS_EXPORT KDE_IMPORT
-# endif 
-#endif 
-
 #ifndef KJSEMBED_EXPORT
 # ifdef MAKE_KJSEMBED_LIB
 #  define KJSEMBED_EXPORT KDE_EXPORT
--- trunk/KDE/kdelibs/kjs/CMakeLists.txt #648670:648671
@@ -160,6 +160,7 @@
 
 ########### install files ###############
 install( FILES
+    kjs_export.h
     ExecState.h
     JSImmediate.h
     JSLock.h
--- trunk/KDE/kdelibs/kjs/JSImmediate.h #648670:648671
@@ -22,7 +22,7 @@
 #ifndef KJS_JS_IMMEDIATE_H
 #define KJS_JS_IMMEDIATE_H
 
-#include <kdelibs_export.h>
+#include <kjs/kjs_export.h>
 
 #include "global.h"
 #include "JSType.h"