mirror of https://github.com/python/cpython
Repair more now-obsolete references to config.h.
This commit is contained in:
parent
bd2e3b03d6
commit
76f373d081
|
@ -27,7 +27,7 @@
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* config.h may or may not define DL_IMPORT */
|
/* pyconfig.h may or may not define DL_IMPORT */
|
||||||
#ifndef DL_IMPORT /* declarations for DLL import/export */
|
#ifndef DL_IMPORT /* declarations for DLL import/export */
|
||||||
#define DL_IMPORT(RTYPE) RTYPE
|
#define DL_IMPORT(RTYPE) RTYPE
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -9,7 +9,7 @@ extern "C" {
|
||||||
|
|
||||||
#include "pyconfig.h"
|
#include "pyconfig.h"
|
||||||
|
|
||||||
/* config.h may or may not define DL_IMPORT */
|
/* pyconfig.h may or may not define DL_IMPORT */
|
||||||
#ifndef DL_IMPORT /* declarations for DLL import/export */
|
#ifndef DL_IMPORT /* declarations for DLL import/export */
|
||||||
#define DL_IMPORT(RTYPE) RTYPE
|
#define DL_IMPORT(RTYPE) RTYPE
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -140,7 +140,7 @@ extern DL_IMPORT(void) PyMem_Free(void *);
|
||||||
|
|
||||||
d_malloc(size_t n, char* src_file, unsigned long src_line) c.s.
|
d_malloc(size_t n, char* src_file, unsigned long src_line) c.s.
|
||||||
|
|
||||||
In this case, you would define (for example in config.h) :
|
In this case, you would define (for example in pyconfig.h) :
|
||||||
|
|
||||||
#define PyCore_MALLOC_FUNC d_malloc
|
#define PyCore_MALLOC_FUNC d_malloc
|
||||||
...
|
...
|
||||||
|
|
|
@ -128,7 +128,7 @@ typedef unsigned LONG_LONG Py_uintptr_t;
|
||||||
* #define DONT_HAVE_STAT
|
* #define DONT_HAVE_STAT
|
||||||
* and/or
|
* and/or
|
||||||
* #define DONT_HAVE_FSTAT
|
* #define DONT_HAVE_FSTAT
|
||||||
* to your config.h. Python code beyond this should check HAVE_STAT and
|
* to your pyconfig.h. Python code beyond this should check HAVE_STAT and
|
||||||
* HAVE_FSTAT instead.
|
* HAVE_FSTAT instead.
|
||||||
* Also
|
* Also
|
||||||
* #define DONT_HAVE_SYS_STAT_H
|
* #define DONT_HAVE_SYS_STAT_H
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#define Py_CONFIG_H
|
#define Py_CONFIG_H
|
||||||
|
|
||||||
/**********************************************************************
|
/**********************************************************************
|
||||||
* config.h. NOT Generated automatically by configure.
|
* pyconfig.h. NOT Generated automatically by configure.
|
||||||
*
|
*
|
||||||
* This is a manually maintained version used for the IBM VisualAge
|
* This is a manually maintained version used for the IBM VisualAge
|
||||||
* C/C++ compiler on the OS/2 platform. It is a standard part of
|
* C/C++ compiler on the OS/2 platform. It is a standard part of
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef Py_CONFIG_H
|
#ifndef Py_CONFIG_H
|
||||||
#define Py_CONFIG_H
|
#define Py_CONFIG_H
|
||||||
|
|
||||||
/* config.h. NOT Generated automatically by configure.
|
/* pyconfig.h. NOT Generated automatically by configure.
|
||||||
|
|
||||||
This is a manually maintained version used for the Watcom,
|
This is a manually maintained version used for the Watcom,
|
||||||
Borland and and Microsoft Visual C++ compilers. It is a
|
Borland and and Microsoft Visual C++ compilers. It is a
|
||||||
|
|
|
@ -50,7 +50,7 @@ To make a Python port, start the Integrated Development Environment
|
||||||
(or makefile) provided. This will enable you to change any source
|
(or makefile) provided. This will enable you to change any source
|
||||||
files or build settings so you can make custom builds.
|
files or build settings so you can make custom builds.
|
||||||
|
|
||||||
config.h An important configuration file specific to PC's.
|
pyconfig.h An important configuration file specific to PC's.
|
||||||
|
|
||||||
config.c The list of C modules to include in the Python PC
|
config.c The list of C modules to include in the Python PC
|
||||||
version. Manually edit this file to add or
|
version. Manually edit this file to add or
|
||||||
|
|
|
@ -172,7 +172,7 @@ Source: Lib\xml\*.py; DestDir: "{app}\Lib\xml"; CopyMode: alwaysoverwrite; Flags
|
||||||
Source: Lib\lib-old\*.py; DestDir: "{app}\Lib\lib-old"; CopyMode: alwaysoverwrite; Components: main
|
Source: Lib\lib-old\*.py; DestDir: "{app}\Lib\lib-old"; CopyMode: alwaysoverwrite; Components: main
|
||||||
Source: Lib\site-packages\README; DestDir: "{app}\Lib\site-packages"; DestName: README.txt; CopyMode: alwaysoverwrite; Components: main
|
Source: Lib\site-packages\README; DestDir: "{app}\Lib\site-packages"; DestName: README.txt; CopyMode: alwaysoverwrite; Components: main
|
||||||
Source: Include\*.h; DestDir: "{app}\include"; CopyMode: alwaysoverwrite; Components: main
|
Source: Include\*.h; DestDir: "{app}\include"; CopyMode: alwaysoverwrite; Components: main
|
||||||
Source: PC\config.h; DestDir: "{app}\include"; CopyMode: alwaysoverwrite; Components: main
|
Source: PC\pyconfig.h; DestDir: "{app}\include"; CopyMode: alwaysoverwrite; Components: main
|
||||||
|
|
||||||
Source: Tools\scripts\*.py; DestDir: "{app}\Tools\Scripts"; CopyMode: alwaysoverwrite; Components: tools
|
Source: Tools\scripts\*.py; DestDir: "{app}\Tools\Scripts"; CopyMode: alwaysoverwrite; Components: tools
|
||||||
Source: Tools\scripts\*.pyw; DestDir: "{app}\Tools\Scripts"; CopyMode: alwaysoverwrite; Components: tools
|
Source: Tools\scripts\*.pyw; DestDir: "{app}\Tools\Scripts"; CopyMode: alwaysoverwrite; Components: tools
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
#include "pyconfig.h"
|
#include "pyconfig.h"
|
||||||
|
|
||||||
/* config.h may or may not define DL_IMPORT */
|
/* pyconfig.h may or may not define DL_IMPORT */
|
||||||
#ifndef DL_IMPORT /* declarations for DLL import/export */
|
#ifndef DL_IMPORT /* declarations for DLL import/export */
|
||||||
#define DL_IMPORT(RTYPE) RTYPE
|
#define DL_IMPORT(RTYPE) RTYPE
|
||||||
#endif
|
#endif
|
||||||
|
|
2
setup.py
2
setup.py
|
@ -84,7 +84,7 @@ class PyBuildExt(build_ext):
|
||||||
for ext in self.extensions[:]:
|
for ext in self.extensions[:]:
|
||||||
ext.sources = [ os.path.join(moddir, filename)
|
ext.sources = [ os.path.join(moddir, filename)
|
||||||
for filename in ext.sources ]
|
for filename in ext.sources ]
|
||||||
ext.include_dirs.append( '.' ) # to get config.h
|
ext.include_dirs.append( '.' ) # to get pyconfig.h
|
||||||
ext.include_dirs.append( os.path.join(srcdir, './Include') )
|
ext.include_dirs.append( os.path.join(srcdir, './Include') )
|
||||||
|
|
||||||
# If a module has already been built statically,
|
# If a module has already been built statically,
|
||||||
|
|
Loading…
Reference in New Issue