Uniform handling of SWIGEXPORT across SWIG.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@7234 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2005-05-27 22:40:58 +00:00
commit 815355b964
8 changed files with 20 additions and 51 deletions

View file

@ -671,7 +671,7 @@ $result = C_SCHEME_UNDEFINED;
extern "C" {
#endif
/* Chicken initialization function */
SWIGEXPORT(void) SWIG_init(C_word, C_word, C_word) C_noret;
SWIGEXPORT void SWIG_init(C_word, C_word, C_word) C_noret;
#ifdef __cplusplus
}
#endif
@ -686,8 +686,7 @@ SWIGEXPORT(void) SWIG_init(C_word, C_word, C_word) C_noret;
#ifdef __cplusplus
extern "C" {
#endif
SWIGEXPORT(void)
SWIG_init(C_word argc, C_word closure, C_word continuation) {
SWIGEXPORTvoid SWIG_init(C_word argc, C_word closure, C_word continuation) {
int i;
C_word sym;
C_word tmp;

View file

@ -41,26 +41,6 @@ typedef SCM (*swig_guile_proc)();
(char *) FUNC_NAME, (char *) msg, \
SCM_EOL, SCM_BOOL_F); else
#ifndef SWIGEXPORT
# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
# if defined(_MSC_VER) || defined(__GNUC__)
# if defined(STATIC_LINKED)
# define SWIGEXPORT(a) a
# else
# define SWIGEXPORT(a) __declspec(dllexport) a
# endif
# else
# if defined(__BORLANDC__)
# define SWIGEXPORT(a) a _export
# else
# define SWIGEXPORT(a) a
# endif
# endif
# else
# define SWIGEXPORT(a) a
# endif
#endif
/* SCM_CHAR and SCM_CHARP were introduced in Guile 1.4; the following is for
1.3.4 compatibility. */
#ifndef SCM_CHAR
@ -117,8 +97,8 @@ SWIG_GUILE_MODULE_STATIC void SWIG_Guile_SetModule(swig_module_info *pointer) {
swig_guile_module = pointer;
}
#else
SWIGEXPORT(swig_module_info *) SWIG_Guile_GetModule();
SWIGEXPORT(void) SWIG_Guile_SetModule(swig_module_info *pointer);
SWIGEXPORT swig_module_info * SWIG_Guile_GetModule();
SWIGEXPORT void SWIG_Guile_SetModule(swig_module_info *pointer);
#endif
static SCM

View file

@ -1,23 +1,13 @@
#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
# if defined(_MSC_VER) || defined(__GNUC__)
# if defined(STATIC_LINKED)
# define SWIGEXPORT(a) a
# else
# define SWIGEXPORT(a) __declspec(dllexport) a
# endif
# else
# if defined(__BORLANDC__)
# define SWIGEXPORT(a) a _export
# else
# define SWIGEXPORT(a) a
# endif
# endif
#else
# define SWIGEXPORT(a) a
#endif
# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
# if defined(STATIC_LINKED)
# define SWIGEXPORT
# else
# define SWIGEXPORT __declspec(dllexport)
# endif
# else
static void *ptr = 0;
SWIGEXPORT(void *)
SWIGEXPORT void *
SWIG_ReturnGlobalTypeList(void *t) {
if (!ptr && !t) ptr = t;
return ptr;

View file

@ -6,12 +6,12 @@ extern "C"
#endif
#ifndef PERL_OBJECT
#ifndef MULTIPLICITY
SWIGEXPORT(void) SWIG_init (CV* cv);
SWIGEXPORT void SWIG_init (CV* cv);
#else
SWIGEXPORT(void) SWIG_init (pTHXo_ CV* cv);
SWIGEXPORT void SWIG_init (pTHXo_ CV* cv);
#endif
#else
SWIGEXPORT(void) SWIG_init (CV *cv, CPerlObj *);
SWIGEXPORT void SWIG_init (CV *cv, CPerlObj *);
#endif
%}

View file

@ -297,7 +297,7 @@ PyModule_AddObject(PyObject *m, char *name, PyObject *o)
#ifdef __cplusplus
extern "C"
#endif
SWIGEXPORT(void) SWIG_init(void) {
SWIGEXPORT void SWIG_init(void) {
static PyObject *SWIG_globals = 0;
PyObject *m, *d;
if (!SWIG_globals) SWIG_globals = SWIG_newvarlink();

View file

@ -626,7 +626,7 @@ extern "C" {
#ifdef MAC_TCL
#pragma export on
#endif
SWIGEXPORT(int) SWIG_init(Tcl_Interp *);
SWIGEXPORT int SWIG_init(Tcl_Interp *);
#ifdef MAC_TCL
#pragma export off
#endif
@ -641,7 +641,7 @@ SWIGEXPORT(int) SWIG_init(Tcl_Interp *);
%insert(init) "swiginit.swg"
%init %{
SWIGEXPORT(int) SWIG_init(Tcl_Interp *interp) {
SWIGEXPORT int SWIG_init(Tcl_Interp *interp) {
int i;
if (interp == 0) return TCL_ERROR;
#ifdef USE_TCL_STUBS