[Python-checkins] CVS: python/dist/src/Python importdl.h,2.10,2.11

[Guido van Rossum]

Update of /projects/cvsroot/python/dist/src/Python
In directory eric:/projects/python/develop/guido/src/Python

Modified Files:
	importdl.h 
Log Message:
Some rearrangements for the importdl.c restructuring.

This is part of a set of patches by Greg Stein.


Index: importdl.h
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Python/importdl.h,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -r2.10 -r2.11
*** importdl.h	1998/08/06 13:36:43	2.10
--- importdl.h	1999/12/20 21:22:24	2.11
***************
*** 1,2 ****
--- 1,9 ----
+ #ifndef Py_IMPORTDL_H
+ #define Py_IMPORTDL_H
+ 
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
  /***********************************************************
  Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
***************
*** 43,51 ****
  };
  
! extern struct filedescr {
  	char *suffix;
  	char *mode;
  	enum filetype type;
! } _PyImport_Filetab[];
  
  extern PyObject *_PyImport_LoadDynamicModule
--- 50,60 ----
  };
  
! struct filedescr {
  	char *suffix;
  	char *mode;
  	enum filetype type;
! };
! extern struct filedescr * _PyImport_Filetab;
! extern const struct filedescr _PyImport_DynLoadFiletab[];
  
  extern PyObject *_PyImport_LoadDynamicModule
***************
*** 54,55 ****
--- 63,80 ----
  /* Max length of module suffix searched for -- accommodates "module.slb" */
  #define MAXSUFFIXSIZE 12
+ 
+ #ifdef MS_WINDOWS
+ typedef FARPROC dl_funcptr;
+ #else
+ #ifdef PYOS_OS2
+ typedef int (* APIENTRY dl_funcptr)();
+ #else
+ typedef void (*dl_funcptr)(void);
+ #endif
+ #endif
+ 
+ 
+ #ifdef __cplusplus
+ }
+ #endif
+ #endif /* !Py_IMPORTDL_H */