diff --git a/src/intl/ld.cpp b/src/intl/ld.cpp index aaf96c0cf4..52a3179394 100644 --- a/src/intl/ld.cpp +++ b/src/intl/ld.cpp @@ -286,7 +286,7 @@ void LD_assert(const SCHAR* filename, int lineno) return (0);\ } -USHORT DLL_EXPORT LD_lookup(USHORT objtype, +USHORT FB_DLL_EXPORT LD_lookup(USHORT objtype, FPTR_SHORT * fun, SSHORT parm1, SSHORT parm2) { /************************************** diff --git a/src/intl/ld.h b/src/intl/ld.h index 598645a128..458f07eb52 100644 --- a/src/intl/ld.h +++ b/src/intl/ld.h @@ -56,9 +56,9 @@ #define UINT16 USHORT #ifdef WIN_NT -#define DLL_EXPORT __declspec(dllexport) +#define FB_DLL_EXPORT __declspec(dllexport) #else -#define DLL_EXPORT +#define FB_DLL_EXPORT #endif @@ -481,9 +481,12 @@ struct CompressPair { // VCS AREA //----------------------------------------------------------------- -// $Header: /home/job/firebird/cvs-backup/firebird2/src/intl/ld.h,v 1.21 2003-09-16 10:33:30 aafemt Exp $ +// $Header: /home/job/firebird/cvs-backup/firebird2/src/intl/ld.h,v 1.22 2003-11-23 16:44:26 skidder Exp $ // $Log: not supported by cvs2svn $ +// Revision 1.21 2003/09/16 10:33:30 aafemt +// 'struct' removal +// // Revision 1.20 2003/08/21 16:22:11 brodsom // -Replace STATIC with static // -Remove a few unused macros diff --git a/src/intl/ld2.cpp b/src/intl/ld2.cpp index 10e59c42f4..65fc410c3c 100644 --- a/src/intl/ld2.cpp +++ b/src/intl/ld2.cpp @@ -89,7 +89,7 @@ void LD2_assert(filename, lineno) -USHORT DLL_EXPORT LD2_lookup(USHORT objtype, +USHORT FB_DLL_EXPORT LD2_lookup(USHORT objtype, FPTR_SHORT * fun, SSHORT parm1, SSHORT parm2) { diff --git a/src/intl/ld_proto.h b/src/intl/ld_proto.h index 84903f5437..1b6e8a9866 100644 --- a/src/intl/ld_proto.h +++ b/src/intl/ld_proto.h @@ -29,11 +29,11 @@ extern "C" { #endif #ifdef DEV_BUILD -void DLL_EXPORT LD_assert(const SCHAR*, int); +void FB_DLL_EXPORT LD_assert(const SCHAR*, int); #endif -USHORT DLL_EXPORT LD_lookup(USHORT, FPTR_SHORT*, SSHORT, SSHORT); -USHORT DLL_EXPORT LD2_lookup(USHORT, FPTR_SHORT*, SSHORT, SSHORT); +USHORT FB_DLL_EXPORT LD_lookup(USHORT, FPTR_SHORT*, SSHORT, SSHORT); +USHORT FB_DLL_EXPORT LD2_lookup(USHORT, FPTR_SHORT*, SSHORT, SSHORT); #ifdef __cplusplus } /* extern "C" */