lib cross build: removed DLL_IMP_EXP, CATS_IMP_EXP and SD_IMP_EXP fro…

…m declarations - mingw cross build does not need them - xxx_IMP_EXP declspec(dllimport|dllexport) always translated into dllexport when building a library which is wrong when using import headers from other bareos libraries
bareos · Sep 11, 2018 · 7d7f4c2 · 7d7f4c2
1 parent 50f0063
commit 7d7f4c2
Show file tree

Hide file tree

Showing 143 changed files with 942 additions and 968 deletions.
diff --git a/core/src/cats/bdb_priv.h b/core/src/cats/bdb_priv.h
@@ -27,7 +27,7 @@
 #error "Illegal inclusion of catalog private interface"
 #endif
 
-class CATS_IMP_EXP BareosDbPrivateInterface: public BareosDb {
+class BareosDbPrivateInterface: public BareosDb {
 protected:
    /*
     * Members

diff --git a/core/src/cats/cats.h b/core/src/cats/cats.h
@@ -554,7 +554,7 @@ typedef struct sql_field {
 } SQL_FIELD;
 #endif
 
-class CATS_IMP_EXP BareosDb: public SmartAlloc, public BareosDbQueryEnum {
+class BareosDb: public SmartAlloc, public BareosDbQueryEnum {
 protected:
    /*
     * Members

diff --git a/core/src/cats/cats_backends.h b/core/src/cats/cats_backends.h
@@ -72,10 +72,10 @@ struct backend_shared_library_t {
 #endif
 
 #if defined(HAVE_DYNAMIC_CATS_BACKENDS)
-DLL_IMP_EXP void DbSetBackendDirs(alist *new_backend_dirs);
+void DbSetBackendDirs(alist *new_backend_dirs);
 #endif
-DLL_IMP_EXP void DbFlushBackends(void);
-DLL_IMP_EXP BareosDb *db_init_database(JobControlRecord *jcr,
+void DbFlushBackends(void);
+BareosDb *db_init_database(JobControlRecord *jcr,
                        const char *db_driver,
                        const char *db_name,
                        const char *db_user,

diff --git a/core/src/cats/dbi.cc b/core/src/cats/dbi.cc
@@ -1452,7 +1452,7 @@ bool BareosDbDBI::SqlBatchInsert(JobControlRecord *jcr, AttributesDbRecord *ar)
  * never have errors, or it is really fatal.
  */
 #ifdef HAVE_DYNAMIC_CATS_BACKENDS
-extern "C" BareosDb CATS_IMP_EXP *backend_instantiate(JobControlRecord *jcr,
+extern "C" BareosDb *backend_instantiate(JobControlRecord *jcr,
                                                   const char *db_driver,
                                                   const char *db_name,
                                                   const char *db_user,
@@ -1536,7 +1536,7 @@ BareosDb *db_init_database(JobControlRecord *jcr,
 }
 
 #ifdef HAVE_DYNAMIC_CATS_BACKENDS
-extern "C" void CATS_IMP_EXP flush_backend(void)
+extern "C" void flush_backend(void)
 #else
 void DbFlushBackends(void)
 #endif

diff --git a/core/src/cats/mysql.cc b/core/src/cats/mysql.cc
@@ -813,7 +813,7 @@ bool BareosDbMysql::SqlBatchInsert(JobControlRecord *jcr, AttributesDbRecord *ar
  * never have errors, or it is really fatal.
  */
 #ifdef HAVE_DYNAMIC_CATS_BACKENDS
-extern "C" BareosDb CATS_IMP_EXP *backend_instantiate(JobControlRecord *jcr,
+extern "C" BareosDb *backend_instantiate(JobControlRecord *jcr,
                                                   const char *db_driver,
                                                   const char *db_name,
                                                   const char *db_user,
@@ -888,7 +888,7 @@ BareosDb *db_init_database(JobControlRecord *jcr,
 }
 
 #ifdef HAVE_DYNAMIC_CATS_BACKENDS
-extern "C" void CATS_IMP_EXP flush_backend(void)
+extern "C" void flush_backend(void)
 #else
 void DbFlushBackends(void)
 #endif

diff --git a/core/src/cats/postgresql.cc b/core/src/cats/postgresql.cc
@@ -1199,7 +1199,7 @@ bool BareosDbPostgresql::SqlBatchInsert(JobControlRecord *jcr, AttributesDbRecor
  * never have errors, or it is really fatal.
  */
 #ifdef HAVE_DYNAMIC_CATS_BACKENDS
-extern "C" BareosDb CATS_IMP_EXP *backend_instantiate(JobControlRecord *jcr,
+extern "C" BareosDb *backend_instantiate(JobControlRecord *jcr,
                                                   const char *db_driver,
                                                   const char *db_name,
                                                   const char *db_user,
@@ -1274,7 +1274,7 @@ BareosDb *db_init_database(JobControlRecord *jcr,
 }
 
 #ifdef HAVE_DYNAMIC_CATS_BACKENDS
-extern "C" void CATS_IMP_EXP flush_backend(void)
+extern "C" void flush_backend(void)
 #else
 void DbFlushBackends(void)
 #endif

diff --git a/core/src/cats/sql.h b/core/src/cats/sql.h
@@ -20,10 +20,10 @@
 */
 #ifndef BAREOS_CATS_SQL_H_
 #define BAREOS_CATS_SQL_H_
-DLL_IMP_EXP int db_int64_handler(void *ctx, int num_fields, char **row);
-DLL_IMP_EXP int DbStrtimeHandler(void *ctx, int num_fields, char **row);
-DLL_IMP_EXP int DbListHandler(void *ctx, int num_fields, char **row);
-DLL_IMP_EXP void DbDebugPrint(JobControlRecord *jcr, FILE *fp);
-DLL_IMP_EXP int DbIntHandler(void *ctx, int num_fields, char **row);
+int db_int64_handler(void *ctx, int num_fields, char **row);
+int DbStrtimeHandler(void *ctx, int num_fields, char **row);
+int DbListHandler(void *ctx, int num_fields, char **row);
+void DbDebugPrint(JobControlRecord *jcr, FILE *fp);
+int DbIntHandler(void *ctx, int num_fields, char **row);
 
 #endif // BAREOS_CATS_SQL_H_
diff --git a/core/src/cats/sql_pooling.h b/core/src/cats/sql_pooling.h
@@ -20,7 +20,7 @@
 */
 #ifndef BAREOS_CATS_SQL_POOLING_H_
 #define BAREOS_CATS_SQL_POOLING_H_
-DLL_IMP_EXP bool db_sql_pool_initialize(const char *db_drivername,
+bool db_sql_pool_initialize(const char *db_drivername,
                             const char *db_name,
                             const char *db_user,
                             const char *db_password,
@@ -35,9 +35,9 @@ DLL_IMP_EXP bool db_sql_pool_initialize(const char *db_drivername,
                             int increment_connections,
                             int idle_timeout,
                             int validate_timeout);
-DLL_IMP_EXP void DbSqlPoolDestroy(void);
-DLL_IMP_EXP void DbSqlPoolFlush(void);
-DLL_IMP_EXP BareosDb *DbSqlGetNonPooledConnection(JobControlRecord *jcr,
+void DbSqlPoolDestroy(void);
+void DbSqlPoolFlush(void);
+BareosDb *DbSqlGetNonPooledConnection(JobControlRecord *jcr,
                                        const char *db_drivername,
                                        const char *db_name,
                                        const char *db_user,
@@ -50,7 +50,7 @@ DLL_IMP_EXP BareosDb *DbSqlGetNonPooledConnection(JobControlRecord *jcr,
                                        bool try_reconnect,
                                        bool exit_on_fatal,
                                        bool need_private = false);
-DLL_IMP_EXP BareosDb *DbSqlGetPooledConnection(JobControlRecord *jcr,
+BareosDb *DbSqlGetPooledConnection(JobControlRecord *jcr,
                                    const char *db_drivername,
                                    const char *db_name,
                                    const char *db_user,
@@ -63,6 +63,6 @@ DLL_IMP_EXP BareosDb *DbSqlGetPooledConnection(JobControlRecord *jcr,
                                    bool try_reconnect,
                                    bool exit_on_fatal,
                                    bool need_private = false);
-DLL_IMP_EXP void DbSqlClosePooledConnection(JobControlRecord *jcr, BareosDb *mdb, bool abort = false);
+void DbSqlClosePooledConnection(JobControlRecord *jcr, BareosDb *mdb, bool abort = false);
 
 #endif // BAREOS_CATS_SQL_POOLING_H_
diff --git a/core/src/cats/sqlite.cc b/core/src/cats/sqlite.cc
@@ -672,7 +672,7 @@ bool BareosDbSqlite::SqlBatchInsert(JobControlRecord *jcr, AttributesDbRecord *a
  * never have errors, or it is really fatal.
  */
 #ifdef HAVE_DYNAMIC_CATS_BACKENDS
-extern "C" BareosDb CATS_IMP_EXP *backend_instantiate(JobControlRecord *jcr,
+extern "C" BareosDb *backend_instantiate(JobControlRecord *jcr,
                                                   const char *db_driver,
                                                   const char *db_name,
                                                   const char *db_user,
@@ -743,7 +743,7 @@ BareosDb *db_init_database(JobControlRecord *jcr,
 }
 
 #ifdef HAVE_DYNAMIC_CATS_BACKENDS
-extern "C" void CATS_IMP_EXP flush_backend(void)
+extern "C" void flush_backend(void)
 #else
 void DbFlushBackends(void)
 #endif

diff --git a/core/src/dird/bsr.h b/core/src/dird/bsr.h
@@ -79,7 +79,7 @@ struct bootstrap_info
 
 RestoreBootstrapRecord *new_bsr();
 namespace directordaemon {
-   DLL_IMP_EXP void FreeBsr(RestoreBootstrapRecord *bsr);
+   void FreeBsr(RestoreBootstrapRecord *bsr);
 } /* namespace director */
 bool CompleteBsr(UaContext *ua, RestoreBootstrapRecord *bsr);
 uint32_t WriteBsrFile(UaContext *ua, RestoreContext &rx);

diff --git a/core/src/filed/fd_plugins.cc b/core/src/filed/fd_plugins.cc
@@ -42,15 +42,15 @@
 /**
  * Function pointers to be set here (findlib)
  */
-extern DLL_IMP_EXP int (*plugin_bopen)(BareosWinFilePacket *bfd, const char *fname, int flags, mode_t mode);
-extern DLL_IMP_EXP int (*plugin_bclose)(BareosWinFilePacket *bfd);
-extern DLL_IMP_EXP ssize_t (*plugin_bread)(BareosWinFilePacket *bfd, void *buf, size_t count);
-extern DLL_IMP_EXP ssize_t (*plugin_bwrite)(BareosWinFilePacket *bfd, void *buf, size_t count);
-extern DLL_IMP_EXP boffset_t (*plugin_blseek)(BareosWinFilePacket *bfd, boffset_t offset, int whence);
-
-extern DLL_IMP_EXP char *exepath;
-extern DLL_IMP_EXP char *version;
-extern DLL_IMP_EXP char *dist_name;
+extern int (*plugin_bopen)(BareosWinFilePacket *bfd, const char *fname, int flags, mode_t mode);
+extern int (*plugin_bclose)(BareosWinFilePacket *bfd);
+extern ssize_t (*plugin_bread)(BareosWinFilePacket *bfd, void *buf, size_t count);
+extern ssize_t (*plugin_bwrite)(BareosWinFilePacket *bfd, void *buf, size_t count);
+extern boffset_t (*plugin_blseek)(BareosWinFilePacket *bfd, boffset_t offset, int whence);
+
+extern char *exepath;
+extern char *version;
+extern char *dist_name;
 
 namespace filedaemon {
 

diff --git a/core/src/findlib/acl.h b/core/src/findlib/acl.h
@@ -106,9 +106,9 @@ struct acl_data_t {
    } u;
 };
 
-DLL_IMP_EXP bacl_exit_code SendAclStream(JobControlRecord *jcr, acl_data_t *acl_data, int stream);
-DLL_IMP_EXP bacl_exit_code BuildAclStreams(JobControlRecord *jcr, acl_data_t *acl_data, FindFilesPacket *ff_pkt);
-DLL_IMP_EXP bacl_exit_code parse_acl_streams(JobControlRecord *jcr, acl_data_t *acl_data,
+bacl_exit_code SendAclStream(JobControlRecord *jcr, acl_data_t *acl_data, int stream);
+bacl_exit_code BuildAclStreams(JobControlRecord *jcr, acl_data_t *acl_data, FindFilesPacket *ff_pkt);
+bacl_exit_code parse_acl_streams(JobControlRecord *jcr, acl_data_t *acl_data,
                                  int stream, char *content, uint32_t content_length);
 
 #endif
diff --git a/core/src/findlib/attribs.h b/core/src/findlib/attribs.h
@@ -21,8 +21,8 @@
 #ifndef BAREOS_FINDLIB_ATTRIBS_H_
 #define BAREOS_FINDLIB_ATTRIBS_H_
 
-DLL_IMP_EXP int encode_attribsEx(JobControlRecord *jcr, char *attribsEx, FindFilesPacket *ff_pkt);
-DLL_IMP_EXP bool SetAttributes(JobControlRecord *jcr, Attributes *attr, BareosWinFilePacket *ofd);
-DLL_IMP_EXP int SelectDataStream(FindFilesPacket *ff_pkt, bool compatible);
+int encode_attribsEx(JobControlRecord *jcr, char *attribsEx, FindFilesPacket *ff_pkt);
+bool SetAttributes(JobControlRecord *jcr, Attributes *attr, BareosWinFilePacket *ofd);
+int SelectDataStream(FindFilesPacket *ff_pkt, bool compatible);
 
 #endif // BAREOS_FINDLIB_ATTRIBS_H_
diff --git a/core/src/findlib/bfile.cc b/core/src/findlib/bfile.cc
@@ -35,11 +35,11 @@
 
 const int debuglevel = 200;
 
-DLL_IMP_EXP int (*plugin_bopen)(BareosWinFilePacket *bfd, const char *fname, int flags, mode_t mode) = NULL;
-DLL_IMP_EXP int (*plugin_bclose)(BareosWinFilePacket *bfd) = NULL;
-DLL_IMP_EXP ssize_t (*plugin_bread)(BareosWinFilePacket *bfd, void *buf, size_t count) = NULL;
-DLL_IMP_EXP ssize_t (*plugin_bwrite)(BareosWinFilePacket *bfd, void *buf, size_t count) = NULL;
-DLL_IMP_EXP boffset_t (*plugin_blseek)(BareosWinFilePacket *bfd, boffset_t offset, int whence) = NULL;
+int (*plugin_bopen)(BareosWinFilePacket *bfd, const char *fname, int flags, mode_t mode) = NULL;
+int (*plugin_bclose)(BareosWinFilePacket *bfd) = NULL;
+ssize_t (*plugin_bread)(BareosWinFilePacket *bfd, void *buf, size_t count) = NULL;
+ssize_t (*plugin_bwrite)(BareosWinFilePacket *bfd, void *buf, size_t count) = NULL;
+boffset_t (*plugin_blseek)(BareosWinFilePacket *bfd, boffset_t offset, int whence) = NULL;
 
 #ifdef HAVE_DARWIN_OS
 #include <sys/paths.h>

diff --git a/core/src/findlib/bfile.h b/core/src/findlib/bfile.h
@@ -118,23 +118,23 @@ struct BareosWinFilePacket {
 
 #endif
 
-DLL_IMP_EXP void binit(BareosWinFilePacket *bfd);
-DLL_IMP_EXP bool IsBopen(BareosWinFilePacket *bfd);
-DLL_IMP_EXP bool set_win32_backup(BareosWinFilePacket *bfd);
-DLL_IMP_EXP bool SetPortableBackup(BareosWinFilePacket *bfd);
-DLL_IMP_EXP bool SetCmdPlugin(BareosWinFilePacket *bfd, JobControlRecord *jcr);
-DLL_IMP_EXP bool have_win32_api();
-DLL_IMP_EXP bool IsPortableBackup(BareosWinFilePacket *bfd);
-DLL_IMP_EXP bool IsRestoreStreamSupported(int stream);
-DLL_IMP_EXP bool is_win32_stream(int stream);
-DLL_IMP_EXP int bopen(BareosWinFilePacket *bfd, const char *fname, int flags, mode_t mode, dev_t rdev);
-DLL_IMP_EXP int BopenRsrc(BareosWinFilePacket *bfd, const char *fname, int flags, mode_t mode);
-DLL_IMP_EXP int bclose(BareosWinFilePacket *bfd);
-DLL_IMP_EXP ssize_t bread(BareosWinFilePacket *bfd, void *buf, size_t count);
-DLL_IMP_EXP ssize_t bwrite(BareosWinFilePacket *bfd, void *buf, size_t count);
-DLL_IMP_EXP boffset_t blseek(BareosWinFilePacket *bfd, boffset_t offset, int whence);
-DLL_IMP_EXP const char *stream_to_ascii(int stream);
-
-DLL_IMP_EXP bool processWin32BackupAPIBlock (BareosWinFilePacket *bfd, void *pBuffer, ssize_t dwSize);
+void binit(BareosWinFilePacket *bfd);
+bool IsBopen(BareosWinFilePacket *bfd);
+bool set_win32_backup(BareosWinFilePacket *bfd);
+bool SetPortableBackup(BareosWinFilePacket *bfd);
+bool SetCmdPlugin(BareosWinFilePacket *bfd, JobControlRecord *jcr);
+bool have_win32_api();
+bool IsPortableBackup(BareosWinFilePacket *bfd);
+bool IsRestoreStreamSupported(int stream);
+bool is_win32_stream(int stream);
+int bopen(BareosWinFilePacket *bfd, const char *fname, int flags, mode_t mode, dev_t rdev);
+int BopenRsrc(BareosWinFilePacket *bfd, const char *fname, int flags, mode_t mode);
+int bclose(BareosWinFilePacket *bfd);
+ssize_t bread(BareosWinFilePacket *bfd, void *buf, size_t count);
+ssize_t bwrite(BareosWinFilePacket *bfd, void *buf, size_t count);
+boffset_t blseek(BareosWinFilePacket *bfd, boffset_t offset, int whence);
+const char *stream_to_ascii(int stream);
+
+bool processWin32BackupAPIBlock (BareosWinFilePacket *bfd, void *pBuffer, ssize_t dwSize);
 
 #endif /* BAREOS_FINDLIB_BFILE_H_ */
diff --git a/core/src/findlib/create_file.h b/core/src/findlib/create_file.h
@@ -21,6 +21,6 @@
 #ifndef BAREOS_FINDLIB_CREATE_FILE_H_
 #define BAREOS_FINDLIB_CREATE_FILE_H_
 
-DLL_IMP_EXP int CreateFile(JobControlRecord *jcr, Attributes *attr, BareosWinFilePacket *ofd, int replace);
+int CreateFile(JobControlRecord *jcr, Attributes *attr, BareosWinFilePacket *ofd, int replace);
 
 #endif // BAREOS_FINDLIB_CREATE_FILE_H_
diff --git a/core/src/findlib/drivetype.h b/core/src/findlib/drivetype.h
@@ -21,6 +21,6 @@
 #ifndef BAREOS_FINDLIB_DRIVETYPE_H_
 #define BAREOS_FINDLIB_DRIVETYPE_H_
 
-DLL_IMP_EXP bool Drivetype(const char *fname, char *fs, int fslen);
+bool Drivetype(const char *fname, char *fs, int fslen);
 
 #endif // BAREOS_FINDLIB_DRIVETYPE_H_
diff --git a/core/src/findlib/enable_priv.h b/core/src/findlib/enable_priv.h
@@ -21,6 +21,6 @@
 #ifndef BAREOS_FINDLIB_ENABLE_PRIV_H_
 #define BAREOS_FINDLIB_ENABLE_PRIV_H_
 
-DLL_IMP_EXP int EnableBackupPrivileges(JobControlRecord *jcr, int ignore_errors);
+int EnableBackupPrivileges(JobControlRecord *jcr, int ignore_errors);
 
 #endif // BAREOS_FINDLIB_ENABLE_PRIV_H_
diff --git a/core/src/findlib/find.h b/core/src/findlib/find.h
@@ -66,7 +66,7 @@ struct utimbuf {
 #endif
 #ifdef USE_READDIR_R
 #ifndef HAVE_READDIR_R
-DLL_IMP_EXP int Readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result);
+int Readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result);
 #endif
 #endif
 /**
@@ -271,22 +271,22 @@ struct FindFilesPacket {
    struct HfsPlusInfo hfsinfo;       /**< Finder Info and resource fork size */
 };
 
-DLL_IMP_EXP FindFilesPacket *init_find_files();
-DLL_IMP_EXP void SetFindOptions(FindFilesPacket *ff, bool incremental, time_t mtime);
-DLL_IMP_EXP void SetFindChangedFunction(FindFilesPacket *ff, bool CheckFct(JobControlRecord *jcr, FindFilesPacket *ff));
-DLL_IMP_EXP int FindFiles(JobControlRecord *jcr, FindFilesPacket *ff, int file_sub(JobControlRecord *, FindFilesPacket *ff_pkt, bool),
+FindFilesPacket *init_find_files();
+void SetFindOptions(FindFilesPacket *ff, bool incremental, time_t mtime);
+void SetFindChangedFunction(FindFilesPacket *ff, bool CheckFct(JobControlRecord *jcr, FindFilesPacket *ff));
+int FindFiles(JobControlRecord *jcr, FindFilesPacket *ff, int file_sub(JobControlRecord *, FindFilesPacket *ff_pkt, bool),
                int PluginSub(JobControlRecord *, FindFilesPacket *ff_pkt, bool));
-DLL_IMP_EXP bool MatchFiles(JobControlRecord *jcr, FindFilesPacket *ff, int sub(JobControlRecord *, FindFilesPacket *ff_pkt, bool));
-DLL_IMP_EXP int TermFindFiles(FindFilesPacket *ff);
-DLL_IMP_EXP bool IsInFileset(FindFilesPacket *ff);
-DLL_IMP_EXP bool AcceptFile(FindFilesPacket *ff);
-DLL_IMP_EXP findIncludeExcludeItem *allocate_new_incexe(void);
-DLL_IMP_EXP findIncludeExcludeItem *new_exclude(findFILESET *fileset);
-DLL_IMP_EXP findIncludeExcludeItem *new_include(findFILESET *fileset);
-DLL_IMP_EXP findIncludeExcludeItem *new_preinclude(findFILESET *fileset);
-DLL_IMP_EXP findIncludeExcludeItem *new_preexclude(findFILESET *fileset);
-DLL_IMP_EXP findFOPTS *start_options(FindFilesPacket *ff);
-DLL_IMP_EXP void NewOptions(FindFilesPacket *ff, findIncludeExcludeItem *incexe);
+bool MatchFiles(JobControlRecord *jcr, FindFilesPacket *ff, int sub(JobControlRecord *, FindFilesPacket *ff_pkt, bool));
+int TermFindFiles(FindFilesPacket *ff);
+bool IsInFileset(FindFilesPacket *ff);
+bool AcceptFile(FindFilesPacket *ff);
+findIncludeExcludeItem *allocate_new_incexe(void);
+findIncludeExcludeItem *new_exclude(findFILESET *fileset);
+findIncludeExcludeItem *new_include(findFILESET *fileset);
+findIncludeExcludeItem *new_preinclude(findFILESET *fileset);
+findIncludeExcludeItem *new_preexclude(findFILESET *fileset);
+findFOPTS *start_options(FindFilesPacket *ff);
+void NewOptions(FindFilesPacket *ff, findIncludeExcludeItem *incexe);
 
 
 #include "acl.h"

diff --git a/core/src/findlib/find_one.h b/core/src/findlib/find_one.h
@@ -21,11 +21,11 @@
 #ifndef BAREOS_FINDLIB_FIND_ONE_H_
 #define BAREOS_FINDLIB_FIND_ONE_H_
 
-DLL_IMP_EXP int FindOneFile(JobControlRecord *jcr, FindFilesPacket *ff,
+int FindOneFile(JobControlRecord *jcr, FindFilesPacket *ff,
                   int HandleFile(JobControlRecord *jcr, FindFilesPacket *ff_pkt, bool top_level),
                   char *p, dev_t parent_device, bool top_level);
-DLL_IMP_EXP int TermFindOne(FindFilesPacket *ff);
-DLL_IMP_EXP bool HasFileChanged(JobControlRecord *jcr, FindFilesPacket *ff_pkt);
-DLL_IMP_EXP bool CheckChanges(JobControlRecord *jcr, FindFilesPacket *ff_pkt);
+int TermFindOne(FindFilesPacket *ff);
+bool HasFileChanged(JobControlRecord *jcr, FindFilesPacket *ff_pkt);
+bool CheckChanges(JobControlRecord *jcr, FindFilesPacket *ff_pkt);
 
 #endif // BAREOS_FINDLIB_FIND_ONE_H_
diff --git a/core/src/findlib/fstype.h b/core/src/findlib/fstype.h
@@ -21,7 +21,7 @@
 #ifndef BAREOS_FINDLIB_FSTYPE_H_
 #define BAREOS_FINDLIB_FSTYPE_H_
 
-DLL_IMP_EXP bool fstype(const char *fname, char *fs, int fslen);
-DLL_IMP_EXP bool FstypeEquals(const char *fname, const char *fstypename);
+bool fstype(const char *fname, char *fs, int fslen);
+bool FstypeEquals(const char *fname, const char *fstypename);
 
 #endif // BAREOS_FINDLIB_FSTYPE_H_
diff --git a/core/src/findlib/get_priv.h b/core/src/findlib/get_priv.h
@@ -21,6 +21,6 @@
 #ifndef BAREOS_FINDLIB_GET_PRIV_H_
 #define BAREOS_FINDLIB_GET_PRIV_H_
 
-DLL_IMP_EXP int EnableBackupPrivileges(JobControlRecord *jcr, int ignore_errors);
+int EnableBackupPrivileges(JobControlRecord *jcr, int ignore_errors);
 
 #endif // BAREOS_FINDLIB_GET_PRIV_H_
diff --git a/core/src/findlib/hardlink.h b/core/src/findlib/hardlink.h
@@ -21,9 +21,9 @@
 #ifndef BAREOS_FINDLIB_HARDLINK_H_
 #define BAREOS_FINDLIB_HARDLINK_H_
 
-DLL_IMP_EXP CurLink *lookup_hardlink(JobControlRecord *jcr, FindFilesPacket *ff_pkt, ino_t ino, dev_t dev);
-DLL_IMP_EXP CurLink *new_hardlink(JobControlRecord *jcr, FindFilesPacket *ff_pkt, char *fname, ino_t ino, dev_t dev);
-DLL_IMP_EXP void FfPktSetLinkDigest(FindFilesPacket *ff_pkt,
+CurLink *lookup_hardlink(JobControlRecord *jcr, FindFilesPacket *ff_pkt, ino_t ino, dev_t dev);
+CurLink *new_hardlink(JobControlRecord *jcr, FindFilesPacket *ff_pkt, char *fname, ino_t ino, dev_t dev);
+void FfPktSetLinkDigest(FindFilesPacket *ff_pkt,
                             int32_t digest_stream,
                             const char *digest,
                             uint32_t len);