rename macro due to name clash on Windows
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7369 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
b624447c33
commit
cc4950fe05
1 changed files with 7 additions and 5 deletions
|
|
@ -1,24 +1,26 @@
|
||||||
%module extern_declaration
|
%module extern_declaration
|
||||||
|
|
||||||
// Test different calling conventions on Windows. Old versions of SWIG generated
|
// Test different calling conventions on Windows. Old versions of SWIG generated
|
||||||
// an incorrect extern declarations that wouldn't compile with Windows compilers.
|
// an incorrect extern declaration that wouldn't compile with Windows compilers.
|
||||||
#define SWIGEXPORT
|
#define SWIGEXPORT
|
||||||
#define SWIGSTDCALL
|
#define SWIGSTDCALL
|
||||||
#define DLLIMPORT
|
#define MYDLLIMPORT
|
||||||
|
|
||||||
%{
|
%{
|
||||||
#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
|
#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
|
||||||
# define DLLIMPORT __declspec(dllimport)
|
# define MYDLLIMPORT __declspec(dllimport)
|
||||||
#else
|
#else
|
||||||
# define DLLIMPORT
|
# define MYDLLIMPORT
|
||||||
#endif
|
#endif
|
||||||
%}
|
%}
|
||||||
|
|
||||||
DLLIMPORT extern int externimport(int i);
|
MYDLLIMPORT extern int externimport(int i);
|
||||||
SWIGEXPORT extern int externexport(int);
|
SWIGEXPORT extern int externexport(int);
|
||||||
extern int SWIGSTDCALL externstdcall(int);
|
extern int SWIGSTDCALL externstdcall(int);
|
||||||
|
|
||||||
%{
|
%{
|
||||||
|
// externimport ought to be using MYDLLIMPORT and compiled into another dll, but that is
|
||||||
|
// a bit tricky to do in the test framework
|
||||||
SWIGEXPORT extern int externimport(int i) { return i; }
|
SWIGEXPORT extern int externimport(int i) { return i; }
|
||||||
SWIGEXPORT extern int externexport(int i) { return i; }
|
SWIGEXPORT extern int externexport(int i) { return i; }
|
||||||
extern int SWIGSTDCALL externstdcall(int i) { return i; }
|
extern int SWIGSTDCALL externstdcall(int i) { return i; }
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue