traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Got rid of 68k-Mac and other outdated ifdefs.

This commit is contained in:
Jack Jansen 2001-08-07 15:30:23 +00:00
parent 71c5b02859
commit b760923b20
5 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Mac/Include/pyconfig.h
View File

@ -469,12 +469,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#undef HAVE_HSTRERROR
/* Define if you have the hypot function. */
#ifndef __MC68K__
/* 68K hypot definition (and implementation) are unuseable
** because they use 10-byte floats.
*/
#define HAVE_HYPOT
#endif
/* Define if you have the inet_pton function. */
#undef HAVE_INET_PTON

6
Mac/Modules/macspeechmodule.c
View File

@ -42,10 +42,8 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "pascal.h"
#endif /* __MWERKS__ */
#ifdef __powerc
#include <CodeFragments.h>
int lib_available;
#endif /* __powerc */
/* Somehow the Apple Fix2X and X2Fix don't do what I expect */
#define fixed2double(x) (((double)(x))/32768.0)
@ -60,9 +58,7 @@ init_available() {
OSErr err;
long result;
#ifdef __powerc
lib_available = ((ProcPtr)SpeakString != (ProcPtr)0);
#endif
err = Gestalt(gestaltSpeechAttr, &result);
if ( err == noErr && (result & (1<<gestaltSpeechMgrPresent)))
return 1;
@ -75,12 +71,10 @@ check_available() {
PyErr_SetString(ms_error_object, "Speech Mgr not available");
return 0;
}
#ifdef __powerc
if ( !lib_available ) {
PyErr_SetString(ms_error_object, "Speech Mgr available, but shared lib missing");
return 0;
}
#endif
return 1;
}

4
Mac/Python/macapplication.c
View File

@ -27,10 +27,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <Resources.h>
#include <CodeFragments.h>
#ifdef __CFM68K__
#pragma lib_export on
#endif
extern void PyMac_InitApplication(void);
#ifdef USE_MAC_APPLET_SUPPORT
extern void PyMac_InitApplet(void);

16
Mac/Python/macglue.c
View File

@ -46,19 +46,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <Menus.h>
#include <TextUtils.h>
#include <LowMem.h>
#ifdef __CFM68K__
/* cfm68k InterfaceLib exports GetEventQueue, but Events.h doesn't know this
** and defines it as GetEvQHdr (which is correct for PPC). This fix is for
** CW9, check that the workaround is still needed for the next release.
*/
#define GetEvQHdr GetEventQueue
#endif /* __CFM68K__ */
#include <Events.h>
#ifdef __CFM68K__
#undef GetEventQueue
#endif /* __CFM68K__ */
#else
#include <Carbon/Carbon.h>
#endif
@ -99,11 +87,7 @@ extern pascal unsigned char *PLstrrchr(unsigned char *, unsigned char);
** raise a MemoryError.
*/
#ifndef MINIMUM_STACK_SIZE
#ifdef __powerc
#define MINIMUM_STACK_SIZE 8192
#else
#define MINIMUM_STACK_SIZE 4096
#endif
#endif
#if TARGET_API_MAC_CARBON

6
Mac/Python/macimport.c
View File

@ -145,15 +145,9 @@ findnamedresource(
if ( ok && dataptr != NULL ) {
HLock(h);
/* XXXX Unsafe if resource not correctly formatted! */
#ifdef __CFM68K__
/* for cfm68k we take the second pstring */
*dataptr = *((*h)+(**h)+1);
memcpy(dataptr+1, (*h)+(**h)+2, (int)*dataptr);
#else
/* for ppc we take the first pstring */
*dataptr = **h;
memcpy(dataptr+1, (*h)+1, (int)*dataptr);
#endif
HUnlock(h);
}
if ( filerh != -1 )