From 1799eb59daa2dbb08a2c251145f19b63da77625a Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Wed, 22 May 1996 16:37:29 +0000 Subject: Non-trivial DL_IMPORT must now be defined in config.h. Include . Include several more Python header files, including new pydebug.h. --- Include/allobjects.h | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/Include/allobjects.h b/Include/allobjects.h index 7573699..03b6363 100644 --- a/Include/allobjects.h +++ b/Include/allobjects.h @@ -28,27 +28,15 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Include nearly all Python header files */ -/* Some systems (well, NT anyway!) require special declarations for - data items imported from dynamic modules. Note that this defn is - only turned on for the modules built as DL modules, not for python - itself. -*/ -#define DL_IMPORT( RTYPE ) RTYPE /* Save lots of #else/#if's */ -#ifdef USE_DL_IMPORT -#ifdef NT -#undef DL_IMPORT -#define DL_IMPORT(RTYPE) __declspec(dllimport) RTYPE -#endif /* NT */ -#ifdef __BORLANDC__ -#undef DL_IMPORT -#define DL_IMPORT(RTYPE) RTYPE __import -#endif /* BORLANDC */ -#endif /* USE_DL_IMPORT */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif +/* config.h may or may not define DL_IMPORT */ +#ifndef DL_IMPORT /* declarations for DLL import/export */ +#define DL_IMPORT(RTYPE) RTYPE +#endif + #ifdef SYMANTEC__CFM68K__ #define UsingSharedLibs #endif @@ -56,6 +44,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include #include +#ifdef HAVE_STDLIB_H +#include +#endif #include "myproto.h" @@ -66,6 +57,8 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "object.h" #include "objimpl.h" +#include "pydebug.h" + #include "accessobject.h" #include "intobject.h" #include "longobject.h" @@ -84,12 +77,18 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "classobject.h" #include "fileobject.h" #include "cobject.h" +#include "traceback.h" #include "errors.h" #include "mymalloc.h" #include "modsupport.h" #include "ceval.h" +#include "pythonrun.h" +#include "sysmodule.h" +#include "intrcheck.h" +#include "import.h" +#include "bltinmodule.h" #include "abstract.h" -- cgit v0.12