SVN commit 650586 by winterz: per dfaure, move the KIOSLAVE_FILE_EXPORT into its own foo_export.h M +0 -14 kio/kio/kio_export.h M +1 -1 kioslave/file/CMakeLists.txt M +1 -1 kioslave/file/file.h A kioslave/file/kioslave_file_export.h [License: LGPL (v2+)] --- trunk/KDE/kdelibs/kio/kio/kio_export.h #650585:650586 @@ -36,28 +36,14 @@ # endif #endif -#ifndef KIOSLAVE_FILE_EXPORT -# if defined(MAKE_KIO_FILE_LIB) - /* We are building this library */ -# define KIOSLAVE_FILE_EXPORT KDE_EXPORT -# else - /* We are using this library */ -# define KIOSLAVE_FILE_EXPORT KDE_IMPORT -# endif -#endif - #else /* UNIX */ #define KIO_EXPORT KDE_EXPORT -#define KIOSLAVE_FILE_EXPORT KDE_EXPORT #endif # ifndef KIO_EXPORT_DEPRECATED # define KIO_EXPORT_DEPRECATED KDE_DEPRECATED KIO_EXPORT # endif -# ifndef KIOSLAVE_FILE_EXPORT_DEPRECATED -# define KIOSLAVE_FILE_EXPORT_DEPRECATED KDE_DEPRECATED KIOSLAVE_FILE_EXPORT -# endif #endif --- trunk/KDE/kdelibs/kioslave/file/CMakeLists.txt #650585:650586 @@ -20,7 +20,7 @@ ########### install files ############### install( FILES file.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES file.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio ) +install( FILES kioslave_file_export.h file.h DESTINATION ${INCLUDE_INSTALL_DIR}/kio ) --- trunk/KDE/kdelibs/kioslave/file/file.h #650585:650586 @@ -23,7 +23,7 @@ #ifndef __file_h__ #define __file_h__ -#include +#include "kioslave_file_export.h" #include #include