From 2dc2a3dd3f75fbc5b3c4c31eff9ffae406ee76e5 Mon Sep 17 00:00:00 2001 From: Roger Hughston Date: Tue, 24 May 2005 03:10:57 +0000 Subject: [PATCH] *** empty log message *** --- dtool/src/interrogatedb/py_panda.h | 6 ++++-- dtool/src/prc/configVariableFilename.h | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dtool/src/interrogatedb/py_panda.h b/dtool/src/interrogatedb/py_panda.h index 02bf52f6ab..c0eab5b6c5 100755 --- a/dtool/src/interrogatedb/py_panda.h +++ b/dtool/src/interrogatedb/py_panda.h @@ -431,9 +431,11 @@ DTOOL_C_LINKAGE inline PyObject * DTool_CreatePyInstance(void * local_this, Dto // Macro(s) class definition .. Used to allocate storage and // init some values for a Dtool Py Type object. ///////////////////////////////////////////////////////////////////////////////// +//struct PyMethodDef Dtool_Methods_##CLASS_NAME[]; + #define Define_Module_Class_Forward(MODULE_NAME,CLASS_NAME,CNAME,PUBLIC_NAME)\ IMPORT_THIS Dtool_PyTypedObject Dtool_##CLASS_NAME; \ -extern PyMethodDef Dtool_Methods_##CLASS_NAME[];\ +struct PyMethodDef Dtool_Methods_##CLASS_NAME[];\ DTOOL_C_LINKAGE int Dtool_Init_##CLASS_NAME(PyObject *self, PyObject *args, PyObject *kwds);\ DTOOL_C_LINKAGE PyObject *Dtool_new_##CLASS_NAME(PyTypeObject *type, PyObject *args, PyObject *kwds);\ DTOOL_C_LINKAGE void * Dtool_UpcastInterface_##CLASS_NAME(PyObject *self, Dtool_PyTypedObject *requested_type);\ @@ -444,7 +446,7 @@ DTOOL_C_LINKAGEvoid Dtool_PyModuleClassInit_##CLASS_NAME(PyObject *module);\ /////////////////////////////////////////////////////////////////////////////// #define Define_Module_Class_Internal(MODULE_NAME,CLASS_NAME,CNAME)\ extern "C" Dtool_PyTypedObject Dtool_##CLASS_NAME; \ -extern PyMethodDef Dtool_Methods_##CLASS_NAME[];\ +struct PyMethodDef Dtool_Methods_##CLASS_NAME[];\ DTOOL_C_LINKAGE int Dtool_Init_##CLASS_NAME(PyObject *self, PyObject *args, PyObject *kwds);\ DTOOL_C_LINKAGE PyObject *Dtool_new_##CLASS_NAME(PyTypeObject *type, PyObject *args, PyObject *kwds);\ DTOOL_C_LINKAGE void * Dtool_UpcastInterface_##CLASS_NAME(PyObject *self, Dtool_PyTypedObject *requested_type);\ diff --git a/dtool/src/prc/configVariableFilename.h b/dtool/src/prc/configVariableFilename.h index 69416ffce1..aa44b707f8 100644 --- a/dtool/src/prc/configVariableFilename.h +++ b/dtool/src/prc/configVariableFilename.h @@ -23,6 +23,8 @@ #include "configVariable.h" #include "filename.h" + + //////////////////////////////////////////////////////////////////// // Class : ConfigVariableFilename // Description : This is a convenience class to specialize