From feacd638ffb072d8d27f5e7df91dc3b420e51a6e Mon Sep 17 00:00:00 2001 From: Roger Hughston Date: Tue, 24 May 2005 17:46:10 +0000 Subject: [PATCH] *** empty log message *** --- dtool/src/interrogate/interfaceMakerPythonNative.cxx | 2 +- dtool/src/interrogatedb/py_panda.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dtool/src/interrogate/interfaceMakerPythonNative.cxx b/dtool/src/interrogate/interfaceMakerPythonNative.cxx index 95d646ec18..185b6950f2 100755 --- a/dtool/src/interrogate/interfaceMakerPythonNative.cxx +++ b/dtool/src/interrogate/interfaceMakerPythonNative.cxx @@ -879,7 +879,7 @@ void InterfaceMakerPythonNative::write_module_support(ostream &out,ostream *out_ out << " {\"Dtool_AddToDictionary\", &Dtool_AddToDictionary,METH_VARARGS,\"Used to Items Into a types (tp_dict)\"}, \n"; } - out << " { NULL, NULL ,NULL,NULL}\n" << "};\n\n"; + out << " { NULL, NULL ,0,NULL}\n" << "};\n\n"; out << "struct LibrayDef " << moduledefdef->library_name <<"_moddef = {python_simple_funcs,BuildInstants};\n"; if(out_h != NULL) diff --git a/dtool/src/interrogatedb/py_panda.h b/dtool/src/interrogatedb/py_panda.h index 5650a5d64f..3f57e47c4e 100755 --- a/dtool/src/interrogatedb/py_panda.h +++ b/dtool/src/interrogatedb/py_panda.h @@ -66,8 +66,8 @@ using namespace std; #define IMPORT_THIS __declspec(dllimport) #define IMPORT_FROM_SHARED_LIB __declspec(dllimport) #else -#define EXPORT_THIS DTOOL_C_LINKAGE -#define IMPORT_THIS DTOOL_C_LINKAGE +#define EXPORT_THIS +#define IMPORT_THIS #define IMPORT_FROM_SHARED_LIB #endif ///////////////////////////////////////////////////////////////////////////////////