Repair more now-obsolete references to config.h.

diff --git a/Include/Python.h b/Include/Python.h
index 17ac3747d0ce7347b2448c3c892d82c944797625..f9c33d42fc082fb414a2f8502e061c08d4d201a3 100644 (file)
--- a/Include/Python.h
+++ b/Include/Python.h
@@ -27,7 +27,7 @@
 #include <limits.h>
 #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 */
 #define DL_IMPORT(RTYPE) RTYPE
 #endif

diff --git a/Include/pgenheaders.h b/Include/pgenheaders.h
index 6807c64e1dbc1720709f5049e78172bc03360939..20ac2c7be996e9044c97c69159ca75dac8e0af8a 100644 (file)
--- a/Include/pgenheaders.h
+++ b/Include/pgenheaders.h
@@ -9,7 +9,7 @@ extern "C" {
 
 #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 */
 #define DL_IMPORT(RTYPE) RTYPE
 #endif

diff --git a/Include/pymem.h b/Include/pymem.h
index 71fc8b58d8404effc249721f95af5a2105601f3a..86a69e45718f9b9cadf859405683fb2e808ec6be 100644 (file)
--- a/Include/pymem.h
+++ b/Include/pymem.h
@@ -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.
 
-   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
    ...

diff --git a/Include/pyport.h b/Include/pyport.h
index 5767aab40ff4795d87642218957f473ae26432d7..c589ecd468cad954c711da230555aba7f62bbd6f 100644 (file)
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -128,7 +128,7 @@ typedef unsigned LONG_LONG Py_uintptr_t;
  *      #define DONT_HAVE_STAT
  * and/or
  *      #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.
  * Also
  *      #define DONT_HAVE_SYS_STAT_H

diff --git a/PC/os2vacpp/pyconfig.h b/PC/os2vacpp/pyconfig.h
index e7901e3d8f3ac0297c7f34dd87a74cf8f06f57c6..a5a2f5178845a22380e3931ac0e881f81bc37e1c 100644 (file)
--- a/PC/os2vacpp/pyconfig.h
+++ b/PC/os2vacpp/pyconfig.h
@@ -2,7 +2,7 @@
 #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
  * C/C++ compiler on the OS/2 platform.  It is a standard part of

diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index d0a89079295a271085dcaad39cac69694b6ad8a0..1e279edc656de8cd74efa56f9eb9f27f9a41080b 100644 (file)
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -1,7 +1,7 @@
 #ifndef 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,
 Borland and and Microsoft Visual C++ compilers.  It is a

diff --git a/PC/readme.txt b/PC/readme.txt
index 0455f27670ea8e7352a6e7da2599c318ef03d913..082669900de7a4a7f03ef21b33478e99af5d6c14 100644 (file)
--- a/PC/readme.txt
+++ b/PC/readme.txt
@@ -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\r
 files or build settings so you can make custom builds.\r
 \r
-config.h    An important configuration file specific to PC's.\r
+pyconfig.h    An important configuration file specific to PC's.\r
 \r
 config.c    The list of C modules to include in the Python PC\r
             version.  Manually edit this file to add or\r

diff --git a/PCbuild/python.iss b/PCbuild/python.iss
index 84e2cf241799977965e767c73e2574a725b8b445..80b43c7595411c9aaf9277b03638b235e59f7f4c 100644 (file)
--- a/PCbuild/python.iss
+++ b/PCbuild/python.iss
@@ -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\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: 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\*.pyw; DestDir: "{app}\Tools\Scripts";  CopyMode: alwaysoverwrite; Components: tools

diff --git a/Python/thread.c b/Python/thread.c
index 0b0316a060e46e7b5503f693efec3e9f5eb51dec..3558af0afcd2bb46ffe8b1d753f9cad7013217b9 100644 (file)
--- a/Python/thread.c
+++ b/Python/thread.c
@@ -7,7 +7,7 @@
 
 #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 */
 #define DL_IMPORT(RTYPE) RTYPE
 #endif

diff --git a/setup.py b/setup.py
index eab1f594481845a7d436aae15f7fec3a060a2be6..0d20ece4efdac61068e7e6301c2e5e543db003df 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -84,7 +84,7 @@ class PyBuildExt(build_ext):
         for ext in self.extensions[:]:
             ext.sources = [ os.path.join(moddir, filename)
                             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') )
 
             # If a module has already been built statically,