Browse Source

*** empty log message ***

Roger Hughston 20 years ago
parent
commit
feacd638ff

+ 1 - 1
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 << "  {\"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";
     out << "struct LibrayDef " << moduledefdef->library_name <<"_moddef = {python_simple_funcs,BuildInstants};\n";
     if(out_h != NULL)
     if(out_h != NULL)

+ 2 - 2
dtool/src/interrogatedb/py_panda.h

@@ -66,8 +66,8 @@ using namespace std;
 #define IMPORT_THIS  __declspec(dllimport) 
 #define IMPORT_THIS  __declspec(dllimport) 
 #define IMPORT_FROM_SHARED_LIB __declspec(dllimport) 
 #define IMPORT_FROM_SHARED_LIB __declspec(dllimport) 
 #else
 #else
-#define EXPORT_THIS DTOOL_C_LINKAGE        
-#define IMPORT_THIS DTOOL_C_LINKAGE        
+#define EXPORT_THIS 
+#define IMPORT_THIS 
 #define IMPORT_FROM_SHARED_LIB 
 #define IMPORT_FROM_SHARED_LIB 
 #endif
 #endif
 ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////