KDE/kdelibs/libltdl

[Paulo Moura Guedes]

SVN commit 530991 by mojo:

Ups, there is a ltdl header file so move the exports to there.
This is currently a mess, with the mix of LT_SCOPE and KDECORE_EXPORT. Only touched the needed symbols, I guess it's better for now.

CCMAIL: kde-buildsystem at kde.org

 M  +4 -6      ltdl.c  
 M  +6 -4      ltdl.h  


--- trunk/KDE/kdelibs/libltdl/ltdl.c #530990:530991
@@ -25,8 +25,6 @@
 
 */
 
-#include <kdelibs_export.h>
-
 #if HAVE_CONFIG_H
 #  include <config.h>
 #endif
@@ -1302,7 +1300,7 @@
 static	int		initialized 	= 0;
 
 /* Initialize libltdl. */
-KDECORE_EXPORT int 
+int 
 lt_dlinit ()
 {
   int	      errors   = 0;
@@ -2035,7 +2033,7 @@
   return 0;
 }
 
-KDECORE_EXPORT lt_dlhandle
+lt_dlhandle
 lt_dlopen (filename)
      const char *filename;
 {
@@ -2588,7 +2586,7 @@
   return errors;
 }
 
-KDECORE_EXPORT lt_ptr
+lt_ptr
 lt_dlsym (handle, symbol)
      lt_dlhandle handle;
      const char *symbol;
@@ -2691,7 +2689,7 @@
   return address;
 }
 
-KDECORE_EXPORT const char *
+const char *
 lt_dlerror ()
 {
   const char *error;
--- trunk/KDE/kdelibs/libltdl/ltdl.h #530990:530991
@@ -28,6 +28,8 @@
 #ifndef LTDL_H
 #define LTDL_H 1
 
+#include <kdelibs_export.h>
+
 #include <sys/types.h>		/* for size_t declaration */
 
 
@@ -144,7 +146,7 @@
 LT_SCOPE int lt_dlopen_flag;
 
 /* Initialisation and finalisation functions for libltdl. */
-LT_SCOPE	int	    lt_dlinit		LT_PARAMS((void));
+KDECORE_EXPORT	int	    lt_dlinit		LT_PARAMS((void));
 LT_SCOPE	int	    lt_dlexit		LT_PARAMS((void));
 
 /* Module search path manipultation.  */
@@ -153,11 +155,11 @@
 LT_SCOPE	const char *lt_dlgetsearchpath	LT_PARAMS((void));
 
 /* Portable libltdl versions of the system dlopen() API. */
-LT_SCOPE	lt_dlhandle lt_dlopen		LT_PARAMS((const char *filename));
+KDECORE_EXPORT	lt_dlhandle lt_dlopen		LT_PARAMS((const char *filename));
 LT_SCOPE	lt_dlhandle lt_dlopenext	LT_PARAMS((const char *filename));
-LT_SCOPE	lt_ptr	    lt_dlsym		LT_PARAMS((lt_dlhandle handle,
+KDECORE_EXPORT	lt_ptr	    lt_dlsym		LT_PARAMS((lt_dlhandle handle,
 						     const char *name));
-LT_SCOPE	const char *lt_dlerror		LT_PARAMS((void));
+KDECORE_EXPORT	const char *lt_dlerror		LT_PARAMS((void));
 LT_SCOPE	int	    lt_dlclose		LT_PARAMS((lt_dlhandle handle));
 
 /* Module residency management. */