From 080bb2a42496abe0b898355aef79f3a8376b751f Mon Sep 17 00:00:00 2001 From: "Andrew M. Kuchling" Date: Wed, 16 Aug 2000 12:22:25 +0000 Subject: [PATCH] Deleted now-unused include files --- Include/mymalloc.h | 208 --------------------------------------------- Include/mymath.h | 82 ------------------ Include/myproto.h | 36 -------- Include/myselect.h | 77 ----------------- Include/mytime.h | 38 --------- 5 files changed, 441 deletions(-) delete mode 100644 Include/mymalloc.h delete mode 100644 Include/mymath.h delete mode 100644 Include/myproto.h delete mode 100644 Include/myselect.h delete mode 100644 Include/mytime.h diff --git a/Include/mymalloc.h b/Include/mymalloc.h deleted file mode 100644 index 8dadb66a790..00000000000 --- a/Include/mymalloc.h +++ /dev/null @@ -1,208 +0,0 @@ -/*********************************************************** -Copyright (c) 2000, BeOpen.com. -Copyright (c) 1995-2000, Corporation for National Research Initiatives. -Copyright (c) 1990-1995, Stichting Mathematisch Centrum. -All rights reserved. - -See the file "Misc/COPYRIGHT" for information on usage and -redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES. -******************************************************************/ - -/*************************************** -THIS FILE IS OBSOLETE -USE "pyport.h" INSTEAD -***************************************/ - -#ifndef Py_MYMALLOC_H -#define Py_MYMALLOC_H - -/* Lowest-level memory allocation interface */ - -#define ANY void /* For API compatibility only. Obsolete, do not use. */ - -#ifdef HAVE_STDLIB_H -#include -#endif - -#include "myproto.h" - -#ifdef __cplusplus -/* Move this down here since some C++ #include's don't like to be included - inside an extern "C" */ -extern "C" { -#endif - -#ifndef DL_IMPORT /* declarations for DLL import */ -#define DL_IMPORT(RTYPE) RTYPE -#endif - -#ifndef NULL -#define NULL ((void *)0) -#endif - -#ifdef MALLOC_ZERO_RETURNS_NULL -/* XXX Always allocate one extra byte, since some malloc's return NULL - XXX for malloc(0) or realloc(p, 0). */ -#define _PyMem_EXTRA 1 -#else -#define _PyMem_EXTRA 0 -#endif - -/* - * Core memory allocator - * ===================== - */ - -/* To make sure the interpreter is user-malloc friendly, all memory - APIs are implemented on top of this one. - - The PyCore_* macros can be defined to make the interpreter use a - custom allocator. Note that they are for internal use only. Both - the core and extension modules should use the PyMem_* API. - - See the comment block at the end of this file for two scenarios - showing how to use this to use a different allocator. */ - -#ifndef PyCore_MALLOC_FUNC -#undef PyCore_REALLOC_FUNC -#undef PyCore_FREE_FUNC -#define PyCore_MALLOC_FUNC malloc -#define PyCore_REALLOC_FUNC realloc -#define PyCore_FREE_FUNC free -#endif - -#ifndef PyCore_MALLOC_PROTO -#undef PyCore_REALLOC_PROTO -#undef PyCore_FREE_PROTO -#define PyCore_MALLOC_PROTO (size_t) -#define PyCore_REALLOC_PROTO (void *, size_t) -#define PyCore_FREE_PROTO (void *) -#endif - -#ifdef NEED_TO_DECLARE_MALLOC_AND_FRIEND -extern void *PyCore_MALLOC_FUNC PyCore_MALLOC_PROTO; -extern void *PyCore_REALLOC_FUNC PyCore_REALLOC_PROTO; -extern void PyCore_FREE_FUNC PyCore_FREE_PROTO; -#endif - -#ifndef PyCore_MALLOC -#undef PyCore_REALLOC -#undef PyCore_FREE -#define PyCore_MALLOC(n) PyCore_MALLOC_FUNC(n) -#define PyCore_REALLOC(p, n) PyCore_REALLOC_FUNC((p), (n)) -#define PyCore_FREE(p) PyCore_FREE_FUNC(p) -#endif - -/* BEWARE: - - Each interface exports both functions and macros. Extension modules - should normally use the functions for ensuring binary compatibility - of the user's code across Python versions. Subsequently, if the - Python runtime switches to its own malloc (different from standard - malloc), no recompilation is required for the extensions. - - The macro versions trade compatibility for speed. They can be used - whenever there is a performance problem, but their use implies - recompilation of the code for each new Python release. The Python - core uses the macros because it *is* compiled on every upgrade. - This might not be the case with 3rd party extensions in a custom - setup (for example, a customer does not always have access to the - source of 3rd party deliverables). You have been warned! */ - -/* - * Raw memory interface - * ==================== - */ - -/* Functions */ - -/* Function wrappers around PyCore_MALLOC and friends; useful if you - need to be sure that you are using the same memory allocator as - Python. Note that the wrappers make sure that allocating 0 bytes - returns a non-NULL pointer, even if the underlying malloc - doesn't. Returned pointers must be checked for NULL explicitly. - No action is performed on failure. */ -extern DL_IMPORT(void *) PyMem_Malloc(size_t); -extern DL_IMPORT(void *) PyMem_Realloc(void *, size_t); -extern DL_IMPORT(void) PyMem_Free(void *); - -/* Starting from Python 1.6, the wrappers Py_{Malloc,Realloc,Free} are - no longer supported. They used to call PyErr_NoMemory() on failure. */ - -/* Macros */ -#define PyMem_MALLOC(n) PyCore_MALLOC(n) -#define PyMem_REALLOC(p, n) PyCore_REALLOC((void *)(p), (n)) -#define PyMem_FREE(p) PyCore_FREE((void *)(p)) - -/* - * Type-oriented memory interface - * ============================== - */ - -/* Functions */ -#define PyMem_New(type, n) \ - ( (type *) PyMem_Malloc((n) * sizeof(type)) ) -#define PyMem_Resize(p, type, n) \ - ( (p) = (type *) PyMem_Realloc((n) * sizeof(type)) ) -#define PyMem_Del(p) PyMem_Free(p) - -/* Macros */ -#define PyMem_NEW(type, n) \ - ( (type *) PyMem_MALLOC(_PyMem_EXTRA + (n) * sizeof(type)) ) -#define PyMem_RESIZE(p, type, n) \ - if ((p) == NULL) \ - (p) = (type *)(PyMem_MALLOC( \ - _PyMem_EXTRA + (n) * sizeof(type))); \ - else \ - (p) = (type *)(PyMem_REALLOC((p), \ - _PyMem_EXTRA + (n) * sizeof(type))) -#define PyMem_DEL(p) PyMem_FREE(p) - -/* PyMem_XDEL is deprecated. To avoid the call when p is NULL, - it is recommended to write the test explicitly in the code. - Note that according to ANSI C, free(NULL) has no effect. */ - -#ifdef __cplusplus -} -#endif - -/* SCENARIOS - - Here are two scenarios by Vladimir Marangozov (the author of the - memory allocation redesign). - - 1) Scenario A - - Suppose you want to use a debugging malloc library that collects info on - where the malloc calls originate from. Assume the interface is: - - 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) : - - #define PyCore_MALLOC_FUNC d_malloc - ... - #define PyCore_MALLOC_PROTO (size_t, char *, unsigned long) - ... - #define NEED_TO_DECLARE_MALLOC_AND_FRIEND - - #define PyCore_MALLOC(n) PyCore_MALLOC_FUNC((n), __FILE__, __LINE__) - ... - - 2) Scenario B - - Suppose you want to use malloc hooks (defined & initialized in a 3rd party - malloc library) instead of malloc functions. In this case, you would - define: - - #define PyCore_MALLOC_FUNC (*malloc_hook) - ... - #define NEED_TO_DECLARE_MALLOC_AND_FRIEND - - and ignore the previous definitions about PyCore_MALLOC_FUNC, etc. - - -*/ - - -#endif /* !Py_MYMALLOC_H */ diff --git a/Include/mymath.h b/Include/mymath.h deleted file mode 100644 index cead61a3a04..00000000000 --- a/Include/mymath.h +++ /dev/null @@ -1,82 +0,0 @@ -/*********************************************************** -Copyright (c) 2000, BeOpen.com. -Copyright (c) 1995-2000, Corporation for National Research Initiatives. -Copyright (c) 1990-1995, Stichting Mathematisch Centrum. -All rights reserved. - -See the file "Misc/COPYRIGHT" for information on usage and -redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES. -******************************************************************/ - -/*************************************** -THIS FILE IS OBSOLETE -USE "pyport.h" INSTEAD -***************************************/ - -/* On the 68K Mac, when using CFM (Code Fragment Manager), - requires special treatment -- we need to surround it with - #pragma lib_export off / on... - This is because MathLib.o is a static library, and exporting its - symbols doesn't quite work... - XXX Not sure now... Seems to be something else going on as well... */ - -#ifndef HAVE_HYPOT -extern double hypot(double, double); -#ifdef MWERKS_BEFORE_PRO4 -#define hypot we_dont_want_faulty_hypot_decl -#endif -#endif - -#include - -#ifndef HAVE_HYPOT -#ifdef __MWERKS__ -#undef hypot -#endif -#endif - -#if defined(USE_MSL) && defined(__MC68K__) -/* CodeWarrior MSL 2.1.1 has weird define overrides that don't work -** when you take the address of math functions. If I interpret the -** ANSI C standard correctly this is illegal, but I haven't been able -** to convince the MetroWerks folks of this... -*/ -#undef acos -#undef asin -#undef atan -#undef atan2 -#undef ceil -#undef cos -#undef cosh -#undef exp -#undef fabs -#undef floor -#undef fmod -#undef log -#undef log10 -#undef pow -#undef sin -#undef sinh -#undef sqrt -#undef tan -#undef tanh -#define acos acosd -#define asin asind -#define atan atand -#define atan2 atan2d -#define ceil ceild -#define cos cosd -#define cosh coshd -#define exp expd -#define fabs fabsd -#define floor floord -#define fmod fmodd -#define log logd -#define log10 log10d -#define pow powd -#define sin sind -#define sinh sinhd -#define sqrt sqrtd -#define tan tand -#define tanh tanhd -#endif diff --git a/Include/myproto.h b/Include/myproto.h deleted file mode 100644 index 5d25d2c8b07..00000000000 --- a/Include/myproto.h +++ /dev/null @@ -1,36 +0,0 @@ -/*********************************************************** -Copyright (c) 2000, BeOpen.com. -Copyright (c) 1995-2000, Corporation for National Research Initiatives. -Copyright (c) 1990-1995, Stichting Mathematisch Centrum. -All rights reserved. - -See the file "Misc/COPYRIGHT" for information on usage and -redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES. -******************************************************************/ - -/*************************************** -THIS FILE IS OBSOLETE -DON'T USE Py_PROTO or Py_FPROTO anymore. -***************************************/ - -#ifndef Py_PROTO_H -#define Py_PROTO_H -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef HAVE_PROTOTYPES -#define Py_PROTO(x) x -#else -#define Py_PROTO(x) () -#endif - -#ifndef Py_FPROTO -#define Py_FPROTO(x) Py_PROTO(x) -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* !Py_PROTO_H */ diff --git a/Include/myselect.h b/Include/myselect.h deleted file mode 100644 index 3562af8c42e..00000000000 --- a/Include/myselect.h +++ /dev/null @@ -1,77 +0,0 @@ -/*********************************************************** -Copyright (c) 2000, BeOpen.com. -Copyright (c) 1995-2000, Corporation for National Research Initiatives. -Copyright (c) 1990-1995, Stichting Mathematisch Centrum. -All rights reserved. - -See the file "Misc/COPYRIGHT" for information on usage and -redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES. -******************************************************************/ - -/*************************************** -THIS FILE IS OBSOLETE -USE "pyport.h" INSTEAD -***************************************/ - -#ifndef Py_MYSELECT_H -#define Py_MYSELECT_H -#ifdef __cplusplus -extern "C" { -#endif - -/* Include file for users of select() */ - -/* NB caller must include */ - -#ifdef HAVE_SYS_SELECT_H - -#ifdef SYS_SELECT_WITH_SYS_TIME -#include "mytime.h" -#else /* !SYS_SELECT_WITH_SYS_TIME */ -#include -#endif /* !SYS_SELECT_WITH_SYS_TIME */ - -#include - -#else /* !HAVE_SYS_SELECT_H */ - -#ifdef USE_GUSI1 -/* If we don't have sys/select the definition may be in unistd.h */ -#include -#endif - -#include "mytime.h" - -#endif /* !HAVE_SYS_SELECT_H */ - -/* If the fd manipulation macros aren't defined, - here is a set that should do the job */ - -#ifndef FD_SETSIZE -#define FD_SETSIZE 256 -#endif - -#ifndef FD_SET - -typedef long fd_mask; - -#define NFDBITS (sizeof(fd_mask) * NBBY) /* bits per mask */ -#ifndef howmany -#define howmany(x, y) (((x)+((y)-1))/(y)) -#endif /* howmany */ - -typedef struct fd_set { - fd_mask fds_bits[howmany(FD_SETSIZE, NFDBITS)]; -} fd_set; - -#define FD_SET(n, p) ((p)->fds_bits[(n)/NFDBITS] |= (1 << ((n) % NFDBITS))) -#define FD_CLR(n, p) ((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS))) -#define FD_ISSET(n, p) ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS))) -#define FD_ZERO(p) memset((char *)(p), '\0', sizeof(*(p))) - -#endif /* FD_SET */ - -#ifdef __cplusplus -} -#endif -#endif /* !Py_MYSELECT_H */ diff --git a/Include/mytime.h b/Include/mytime.h deleted file mode 100644 index 07a2480edc3..00000000000 --- a/Include/mytime.h +++ /dev/null @@ -1,38 +0,0 @@ -/*********************************************************** -Copyright (c) 2000, BeOpen.com. -Copyright (c) 1995-2000, Corporation for National Research Initiatives. -Copyright (c) 1990-1995, Stichting Mathematisch Centrum. -All rights reserved. - -See the file "Misc/COPYRIGHT" for information on usage and -redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES. -******************************************************************/ - -/*************************************** -THIS FILE IS OBSOLETE -USE "pyport.h" INSTEAD -***************************************/ - -#ifndef Py_MYTIME_H -#define Py_MYTIME_H -#ifdef __cplusplus -extern "C" { -#endif - -/* Include file instead of and/or */ - -#ifdef TIME_WITH_SYS_TIME -#include -#include -#else /* !TIME_WITH_SYS_TIME */ -#ifdef HAVE_SYS_TIME_H -#include -#else /* !HAVE_SYS_TIME_H */ -#include -#endif /* !HAVE_SYS_TIME_H */ -#endif /* !TIME_WITH_SYS_TIME */ - -#ifdef __cplusplus -} -#endif -#endif /* !Py_MYTIME_H */