Skip to content

C
cpython
Commit 85705e73 authored by Jack Jansen's avatar Jack Jansen
Browse files
Options

Got rid of obsolete defines.

parent 786681ac
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 37 deletions
Mac/mwerks/mwerks_carbon_config.h
View file @ 85705e73
...@@ -8,9 +8,7 @@ ...@@ -8,9 +8,7 @@
#define OPAQUE_TOOLBOX_STRUCTS 1 #define OPAQUE_TOOLBOX_STRUCTS 1
#define TARGET_API_MAC_CARBON 1 #define TARGET_API_MAC_CARBON 1
#define USE_ARGV0_CHDIR /* Workaround for OSXDP4: change dir to argv[0] dir */
#define USE_GUSI2 /* Stdio implemented with GUSI 2 */ #define USE_GUSI2 /* Stdio implemented with GUSI 2 */
/* # define USE_GUSI1 /* Stdio implemented with GUSI 1 */
#define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */ #define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */
#define USE_TOOLBOX /* Include toolbox modules in core Python */ #define USE_TOOLBOX /* Include toolbox modules in core Python */
/* #define USE_CORE_TOOLBOX /* Include minimal set of toolbox modules in core Python */ /* #define USE_CORE_TOOLBOX /* Include minimal set of toolbox modules in core Python */
...@@ -28,13 +26,11 @@ ...@@ -28,13 +26,11 @@
/* #define HAVE_DYNAMIC_LOADING /* Enable dynamically loaded modules */ /* #define HAVE_DYNAMIC_LOADING /* Enable dynamically loaded modules */
/* #define USE_GDBM /* Include the gdbm module */ /* #define USE_GDBM /* Include the gdbm module */
/* #define USE_ZLIB /* Include the zlib module */ /* #define USE_ZLIB /* Include the zlib module */
#define USE_APPEARANCE /* Enable Appearance support */
#define WITH_HOTSHOT /* Enable hotshot profiler */ #define WITH_HOTSHOT /* Enable hotshot profiler */
#define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
#ifndef USE_MSL_MALLOC #ifndef USE_MSL_MALLOC
/* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */ /* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */
#define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */
#endif #endif
#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ #define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
......
Mac/mwerks/mwerks_carbonplugin_config.h
View file @ 85705e73
...@@ -7,11 +7,8 @@ ...@@ -7,11 +7,8 @@
#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ #define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
#define USE_TOOLBOX_OBJECT_GLUE /* Use glue routines for accessing PyArg_Parse/Py_BuildValue helpers */ #define USE_TOOLBOX_OBJECT_GLUE /* Use glue routines for accessing PyArg_Parse/Py_BuildValue helpers */
/* #define USE_GUSI1 /* Stdio implemented with GUSI */
#define USE_GUSI2 /* Stdio implemented with GUSI */ #define USE_GUSI2 /* Stdio implemented with GUSI */
#if defined(USE_GUSI1) || defined(USE_GUSI2)
#define USE_GUSI #define USE_GUSI
#endif
#define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */ #define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */
#define USE_MSL /* Use MSL libraries */ #define USE_MSL /* Use MSL libraries */
#ifdef USE_MSL #ifdef USE_MSL
......
Mac/mwerks/mwerks_nonshared_config.h
View file @ 85705e73
...@@ -5,11 +5,8 @@ ...@@ -5,11 +5,8 @@
** specific features, you may also need different sets of sources. ** specific features, you may also need different sets of sources.
*/ */
/* #define USE_GUSI1 /* Stdio implemented with GUSI */
#define USE_GUSI2 /* Stdio implemented with GUSI 2 */ #define USE_GUSI2 /* Stdio implemented with GUSI 2 */
#if defined(USE_GUSI1) || defined(USE_GUSI2)
#define USE_GUSI #define USE_GUSI
#endif
#define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */ #define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */
#define USE_TOOLBOX /* Include toolbox modules in core Python */ #define USE_TOOLBOX /* Include toolbox modules in core Python */
#define USE_QT /* Include quicktime modules in core Python */ #define USE_QT /* Include quicktime modules in core Python */
...@@ -26,11 +23,9 @@ ...@@ -26,11 +23,9 @@
#define USE_ZLIB /* Include the zlib module */ #define USE_ZLIB /* Include the zlib module */
#define USE_IC /* Include Internet Config module */ #define USE_IC /* Include Internet Config module */
#define USE_PYEXPAT /* Include Pyexpat module */ #define USE_PYEXPAT /* Include Pyexpat module */
#define USE_APPEARANCE /* Enable Appearance support */
#define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
#ifndef USE_MSL_MALLOC #ifndef USE_MSL_MALLOC
/* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */ /* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */
#define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */
#endif #endif
#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ #define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
......
Mac/mwerks/mwerks_nscarbon_config.h
View file @ 85705e73
...@@ -8,11 +8,8 @@ ...@@ -8,11 +8,8 @@
#define OPAQUE_TOOLBOX_STRUCTS 1 #define OPAQUE_TOOLBOX_STRUCTS 1
#define TARGET_API_MAC_CARBON 1 #define TARGET_API_MAC_CARBON 1
#define USE_ARGV0_CHDIR /* Workaround for OSXDP4: change dir to argv[0] dir */
#define USE_GUSI2 /* Stdio implemented with GUSI 2 */ #define USE_GUSI2 /* Stdio implemented with GUSI 2 */
#if defined(USE_GUSI1) || defined(USE_GUSI2)
#define USE_GUSI #define USE_GUSI
#endif
/* #define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */ /* #define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */
#define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */ #define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */
#define USE_TOOLBOX /* Include toolbox modules in core Python */ #define USE_TOOLBOX /* Include toolbox modules in core Python */
...@@ -30,11 +27,9 @@ ...@@ -30,11 +27,9 @@
#define USE_ZLIB /* Include the zlib module */ #define USE_ZLIB /* Include the zlib module */
#define USE_IC /* Include Internet Config module */ #define USE_IC /* Include Internet Config module */
#define USE_PYEXPAT /* Include Pyexpat module */ #define USE_PYEXPAT /* Include Pyexpat module */
#define USE_APPEARANCE /* Enable Appearance support */
#define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
#ifndef USE_MSL_MALLOC #ifndef USE_MSL_MALLOC
/* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */ /* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */
#define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */
#endif #endif
#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ #define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
......
Mac/mwerks/mwerks_plugin_config.h
View file @ 85705e73
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
/* #define USE_GUSI1 /* Stdio implemented with GUSI */ /* #define USE_GUSI1 /* Stdio implemented with GUSI */
#define USE_GUSI2 /* Stdio implemented with GUSI */ #define USE_GUSI2 /* Stdio implemented with GUSI */
#if defined(USE_GUSI1) || defined(USE_GUSI2) #if defined(USE_GUSI2)
#define USE_GUSI #define USE_GUSI
#endif #endif
#define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */ #define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */
......
Mac/mwerks/mwerks_shared_config.h
View file @ 85705e73
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
** specific features, you may also need different sets of sources. ** specific features, you may also need different sets of sources.
*/ */
/* #define USE_GUSI1 /* Stdio implemented with GUSI */
#define USE_GUSI2 /* Stdio implemented with GUSI */ #define USE_GUSI2 /* Stdio implemented with GUSI */
#define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */ #define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */
#define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */ #define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */
...@@ -26,14 +25,12 @@ ...@@ -26,14 +25,12 @@
#define HAVE_DYNAMIC_LOADING /* Enable dynamically loaded modules */ #define HAVE_DYNAMIC_LOADING /* Enable dynamically loaded modules */
/* #define USE_GDBM /* Include the gdbm module */ /* #define USE_GDBM /* Include the gdbm module */
/* #define USE_ZLIB /* Include the zlib module */ /* #define USE_ZLIB /* Include the zlib module */
#define USE_APPEARANCE /* Enable Appearance support */
#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ #define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
#define USE_TOOLBOX_OBJECT_GLUE /* Call toolbox object converters indirectly */ #define USE_TOOLBOX_OBJECT_GLUE /* Call toolbox object converters indirectly */
#define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
#ifndef USE_MSL_MALLOC #ifndef USE_MSL_MALLOC
/* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */ /* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */
#define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */
#endif #endif
#ifdef USE_MSL #ifdef USE_MSL
......
Mac/mwerks/mwerks_shcarbon_config.h
View file @ 85705e73
...@@ -9,9 +9,7 @@ ...@@ -9,9 +9,7 @@
#define OPAQUE_TOOLBOX_STRUCTS 1 #define OPAQUE_TOOLBOX_STRUCTS 1
#define TARGET_API_MAC_CARBON 1 #define TARGET_API_MAC_CARBON 1
#define USE_ARGV0_CHDIR /* Workaround for OSXDP4: change dir to argv[0] dir */
#define USE_GUSI2 /* Stdio implemented with GUSI 2 */ #define USE_GUSI2 /* Stdio implemented with GUSI 2 */
/* # define USE_GUSI1 /* Stdio implemented with GUSI 1 */
#define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */ #define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */
#define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */ #define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */
/* #define USE_CORE_TOOLBOX /* Include core toolbox modules (Dlg,Ctl,Menu,Win,Res,Qd) */ /* #define USE_CORE_TOOLBOX /* Include core toolbox modules (Dlg,Ctl,Menu,Win,Res,Qd) */
...@@ -30,14 +28,12 @@ ...@@ -30,14 +28,12 @@
#define HAVE_DYNAMIC_LOADING /* Enable dynamically loaded modules */ #define HAVE_DYNAMIC_LOADING /* Enable dynamically loaded modules */
/* #define USE_GDBM /* Include the gdbm module */ /* #define USE_GDBM /* Include the gdbm module */
/* #define USE_ZLIB /* Include the zlib module */ /* #define USE_ZLIB /* Include the zlib module */
#define USE_APPEARANCE /* Enable Appearance support */
#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ #define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
#define USE_TOOLBOX_OBJECT_GLUE /* Call toolbox object converters indirectly */ #define USE_TOOLBOX_OBJECT_GLUE /* Call toolbox object converters indirectly */
#define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
#ifndef USE_MSL_MALLOC #ifndef USE_MSL_MALLOC
/* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */ /* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */
#define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */
#endif #endif
#ifdef USE_MSL #ifdef USE_MSL
......
Mac/mwerks/mwerks_small_config.h
View file @ 85705e73
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
*/ */
#define USE_GUSI2 /* Stdio implemented with GUSI 2 */ #define USE_GUSI2 /* Stdio implemented with GUSI 2 */
/* # define USE_GUSI1 /* Stdio implemented with GUSI 1 */
#define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */ #define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */
#define USE_TOOLBOX /* Include toolbox modules in core Python */ #define USE_TOOLBOX /* Include toolbox modules in core Python */
#define USE_QT /* Include quicktime modules in core Python */ #define USE_QT /* Include quicktime modules in core Python */
...@@ -23,14 +22,12 @@ ...@@ -23,14 +22,12 @@
/* #define HAVE_DYNAMIC_LOADING /* Enable dynamically loaded modules */ /* #define HAVE_DYNAMIC_LOADING /* Enable dynamically loaded modules */
/* #define USE_GDBM /* Include the gdbm module */ /* #define USE_GDBM /* Include the gdbm module */
/* #define USE_ZLIB /* Include the zlib module */ /* #define USE_ZLIB /* Include the zlib module */
#define USE_APPEARANCE /* Enable Appearance support */
#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ #define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
#define WITH_HOTSHOT /* Enable hotshot profiler */ #define WITH_HOTSHOT /* Enable hotshot profiler */
#define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
#ifndef USE_MSL_MALLOC #ifndef USE_MSL_MALLOC
/* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */ /* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */
#define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */
#endif #endif
#ifdef USE_MSL #ifdef USE_MSL
......
Mac/mwerks/mwerks_thrcarbonsm_config.h
View file @ 85705e73
...@@ -8,9 +8,7 @@ ...@@ -8,9 +8,7 @@
#define OPAQUE_TOOLBOX_STRUCTS 1 #define OPAQUE_TOOLBOX_STRUCTS 1
#define TARGET_API_MAC_CARBON 1 #define TARGET_API_MAC_CARBON 1
#define USE_ARGV0_CHDIR /* Workaround for OSXDP4: change dir to argv[0] dir */
#define USE_GUSI2 /* Stdio implemented with GUSI 2 */ #define USE_GUSI2 /* Stdio implemented with GUSI 2 */
/* # define USE_GUSI1 /* Stdio implemented with GUSI 1 */
#define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */ #define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */
#define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */ #define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */
#define USE_TOOLBOX /* Include toolbox modules in core Python */ #define USE_TOOLBOX /* Include toolbox modules in core Python */
...@@ -29,13 +27,11 @@ ...@@ -29,13 +27,11 @@
/* #define HAVE_DYNAMIC_LOADING /* Enable dynamically loaded modules */ /* #define HAVE_DYNAMIC_LOADING /* Enable dynamically loaded modules */
/* #define USE_GDBM /* Include the gdbm module */ /* #define USE_GDBM /* Include the gdbm module */
/* #define USE_ZLIB /* Include the zlib module */ /* #define USE_ZLIB /* Include the zlib module */
#define USE_APPEARANCE /* Enable Appearance support */
#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ #define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
#define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
#ifndef USE_MSL_MALLOC #ifndef USE_MSL_MALLOC
/* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */ /* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */
#define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */
#endif #endif
#ifdef USE_MSL #ifdef USE_MSL
......
Mac/mwerks/mwerks_threadsmall_config.h
View file @ 85705e73
...@@ -6,8 +6,7 @@ ...@@ -6,8 +6,7 @@
*/ */
#define USE_GUSI2 /* Stdio implemented with GUSI 2 */ #define USE_GUSI2 /* Stdio implemented with GUSI 2 */
/* # define USE_GUSI1 /* Stdio implemented with GUSI 1 */ #define WITH_THREAD /* Use thread support */
#define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */
#define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */ #define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */
#define USE_TOOLBOX /* Include toolbox modules in core Python */ #define USE_TOOLBOX /* Include toolbox modules in core Python */
#define USE_QT /* Include quicktime modules in core Python */ #define USE_QT /* Include quicktime modules in core Python */
...@@ -24,13 +23,11 @@ ...@@ -24,13 +23,11 @@
/* #define HAVE_DYNAMIC_LOADING /* Enable dynamically loaded modules */ /* #define HAVE_DYNAMIC_LOADING /* Enable dynamically loaded modules */
/* #define USE_GDBM /* Include the gdbm module */ /* #define USE_GDBM /* Include the gdbm module */
/* #define USE_ZLIB /* Include the zlib module */ /* #define USE_ZLIB /* Include the zlib module */
#define USE_APPEARANCE /* Enable Appearance support */
#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ #define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
#define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
#ifndef USE_MSL_MALLOC #ifndef USE_MSL_MALLOC
/* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */ /* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */
#define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */
#endif #endif
#ifdef USE_MSL #ifdef USE_MSL
......
Mac/mwerks/mwerks_tkplugin_config.h
View file @ 85705e73
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#define USE_GUSI2 /* Stdio implemented with GUSI 2 */ #define USE_GUSI2 /* Stdio implemented with GUSI 2 */
/* #define USE_GUSI1 /* Stdio implemented with GUSI 1.X */ /* #define USE_GUSI1 /* Stdio implemented with GUSI 1.X */
#if defined(USE_GUSI1) || defined(USE_GUSI2) #if defined(USE_GUSI2)
#define USE_GUSI #define USE_GUSI
#endif #endif
#define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */ #define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7