From: Jack Jansen Date: Thu, 11 Apr 2002 20:56:15 +0000 (+0000) Subject: Got rid of obsolete defines. X-Git-Tag: v2.3c1~6038 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85705e73b16e1371fea5cb29a304275387f726b3;p=python Got rid of obsolete defines. --- diff --git a/Mac/mwerks/mwerks_carbon_config.h b/Mac/mwerks/mwerks_carbon_config.h index bebdfe1d4a..f3c8de997f 100644 --- a/Mac/mwerks/mwerks_carbon_config.h +++ b/Mac/mwerks/mwerks_carbon_config.h @@ -8,9 +8,7 @@ #define OPAQUE_TOOLBOX_STRUCTS 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_GUSI1 /* Stdio implemented with GUSI 1 */ #define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */ #define USE_TOOLBOX /* Include toolbox modules in core Python */ /* #define USE_CORE_TOOLBOX /* Include minimal set of toolbox modules in core Python */ @@ -28,13 +26,11 @@ /* #define HAVE_DYNAMIC_LOADING /* Enable dynamically loaded modules */ /* #define USE_GDBM /* Include the gdbm module */ /* #define USE_ZLIB /* Include the zlib module */ -#define USE_APPEARANCE /* Enable Appearance support */ #define WITH_HOTSHOT /* Enable hotshot profiler */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */ #ifndef USE_MSL_MALLOC /* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */ -#define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */ #endif #define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ diff --git a/Mac/mwerks/mwerks_carbonplugin_config.h b/Mac/mwerks/mwerks_carbonplugin_config.h index 6a10716dcc..f28cfd3c8c 100644 --- a/Mac/mwerks/mwerks_carbonplugin_config.h +++ b/Mac/mwerks/mwerks_carbonplugin_config.h @@ -7,11 +7,8 @@ #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_GUSI1 /* Stdio implemented with GUSI */ #define USE_GUSI2 /* Stdio implemented with GUSI */ -#if defined(USE_GUSI1) || defined(USE_GUSI2) #define USE_GUSI -#endif #define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */ #define USE_MSL /* Use MSL libraries */ #ifdef USE_MSL diff --git a/Mac/mwerks/mwerks_nonshared_config.h b/Mac/mwerks/mwerks_nonshared_config.h index 64f9a48225..4c1196d80f 100644 --- a/Mac/mwerks/mwerks_nonshared_config.h +++ b/Mac/mwerks/mwerks_nonshared_config.h @@ -5,11 +5,8 @@ ** 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 */ -#if defined(USE_GUSI1) || defined(USE_GUSI2) #define USE_GUSI -#endif #define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */ #define USE_TOOLBOX /* Include toolbox modules in core Python */ #define USE_QT /* Include quicktime modules in core Python */ @@ -26,11 +23,9 @@ #define USE_ZLIB /* Include the zlib module */ #define USE_IC /* Include Internet Config 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 */ #ifndef USE_MSL_MALLOC /* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */ -#define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */ #endif #define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ diff --git a/Mac/mwerks/mwerks_nscarbon_config.h b/Mac/mwerks/mwerks_nscarbon_config.h index 58a5a9b7fe..2e7e1f9920 100644 --- a/Mac/mwerks/mwerks_nscarbon_config.h +++ b/Mac/mwerks/mwerks_nscarbon_config.h @@ -8,11 +8,8 @@ #define OPAQUE_TOOLBOX_STRUCTS 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 */ -#if defined(USE_GUSI1) || defined(USE_GUSI2) #define USE_GUSI -#endif /* #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_TOOLBOX /* Include toolbox modules in core Python */ @@ -30,11 +27,9 @@ #define USE_ZLIB /* Include the zlib module */ #define USE_IC /* Include Internet Config 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 */ #ifndef USE_MSL_MALLOC /* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */ -#define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */ #endif #define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ diff --git a/Mac/mwerks/mwerks_plugin_config.h b/Mac/mwerks/mwerks_plugin_config.h index 1413f44980..3822378d13 100644 --- a/Mac/mwerks/mwerks_plugin_config.h +++ b/Mac/mwerks/mwerks_plugin_config.h @@ -4,7 +4,7 @@ /* #define USE_GUSI1 /* 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 #endif #define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */ diff --git a/Mac/mwerks/mwerks_shared_config.h b/Mac/mwerks/mwerks_shared_config.h index 414bedf030..4fcc83585e 100644 --- a/Mac/mwerks/mwerks_shared_config.h +++ b/Mac/mwerks/mwerks_shared_config.h @@ -6,7 +6,6 @@ ** 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 WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */ #define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */ @@ -26,14 +25,12 @@ #define HAVE_DYNAMIC_LOADING /* Enable dynamically loaded modules */ /* #define USE_GDBM /* Include the gdbm 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 USE_TOOLBOX_OBJECT_GLUE /* Call toolbox object converters indirectly */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */ #ifndef USE_MSL_MALLOC /* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */ -#define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */ #endif #ifdef USE_MSL diff --git a/Mac/mwerks/mwerks_shcarbon_config.h b/Mac/mwerks/mwerks_shcarbon_config.h index a9d3916e2a..0360d0935c 100644 --- a/Mac/mwerks/mwerks_shcarbon_config.h +++ b/Mac/mwerks/mwerks_shcarbon_config.h @@ -9,9 +9,7 @@ #define OPAQUE_TOOLBOX_STRUCTS 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_GUSI1 /* Stdio implemented with 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_CORE_TOOLBOX /* Include core toolbox modules (Dlg,Ctl,Menu,Win,Res,Qd) */ @@ -30,14 +28,12 @@ #define HAVE_DYNAMIC_LOADING /* Enable dynamically loaded modules */ /* #define USE_GDBM /* Include the gdbm 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 USE_TOOLBOX_OBJECT_GLUE /* Call toolbox object converters indirectly */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */ #ifndef USE_MSL_MALLOC /* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */ -#define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */ #endif #ifdef USE_MSL diff --git a/Mac/mwerks/mwerks_small_config.h b/Mac/mwerks/mwerks_small_config.h index 6d08f1bd67..603ab40dcf 100644 --- a/Mac/mwerks/mwerks_small_config.h +++ b/Mac/mwerks/mwerks_small_config.h @@ -6,7 +6,6 @@ */ #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_TOOLBOX /* Include toolbox modules in core Python */ #define USE_QT /* Include quicktime modules in core Python */ @@ -23,14 +22,12 @@ /* #define HAVE_DYNAMIC_LOADING /* Enable dynamically loaded modules */ /* #define USE_GDBM /* Include the gdbm 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 WITH_HOTSHOT /* Enable hotshot profiler */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */ #ifndef USE_MSL_MALLOC /* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */ -#define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */ #endif #ifdef USE_MSL diff --git a/Mac/mwerks/mwerks_thrcarbonsm_config.h b/Mac/mwerks/mwerks_thrcarbonsm_config.h index e52c373f32..958f1c6f08 100644 --- a/Mac/mwerks/mwerks_thrcarbonsm_config.h +++ b/Mac/mwerks/mwerks_thrcarbonsm_config.h @@ -8,9 +8,7 @@ #define OPAQUE_TOOLBOX_STRUCTS 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_GUSI1 /* Stdio implemented with 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_TOOLBOX /* Include toolbox modules in core Python */ @@ -29,13 +27,11 @@ /* #define HAVE_DYNAMIC_LOADING /* Enable dynamically loaded modules */ /* #define USE_GDBM /* Include the gdbm 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 USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */ #ifndef USE_MSL_MALLOC /* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */ -#define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */ #endif #ifdef USE_MSL diff --git a/Mac/mwerks/mwerks_threadsmall_config.h b/Mac/mwerks/mwerks_threadsmall_config.h index 83c8a3e5bd..302a36a167 100644 --- a/Mac/mwerks/mwerks_threadsmall_config.h +++ b/Mac/mwerks/mwerks_threadsmall_config.h @@ -6,8 +6,7 @@ */ #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 */ #define USE_MSL /* Use Mw Standard Library (as opposed to Plaugher C libraries) */ #define USE_TOOLBOX /* Include toolbox modules in core Python */ #define USE_QT /* Include quicktime modules in core Python */ @@ -24,13 +23,11 @@ /* #define HAVE_DYNAMIC_LOADING /* Enable dynamically loaded modules */ /* #define USE_GDBM /* Include the gdbm 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 USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */ #ifndef USE_MSL_MALLOC /* #define USE_MALLOC_DEBUG /* Enable range checking and other malloc debugging */ -#define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */ #endif #ifdef USE_MSL diff --git a/Mac/mwerks/mwerks_tkplugin_config.h b/Mac/mwerks/mwerks_tkplugin_config.h index aef32fbb5e..f3b4e09216 100644 --- a/Mac/mwerks/mwerks_tkplugin_config.h +++ b/Mac/mwerks/mwerks_tkplugin_config.h @@ -4,7 +4,7 @@ #define USE_GUSI2 /* Stdio implemented with GUSI 2 */ /* #define USE_GUSI1 /* Stdio implemented with GUSI 1.X */ -#if defined(USE_GUSI1) || defined(USE_GUSI2) +#if defined(USE_GUSI2) #define USE_GUSI #endif #define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */