mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-22 16:33:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Patch #555929: Cygwin AH_BOTTOM cleanup patch (*** version 2 ***)

Browse source 
This patch complies with the following request found
near the top of configure.in:

# This is for stuff that absolutely must end up in pyconfig.h.
# Please use pyport.h instead, if possible.

I tested this patch under Cygwin, Win32, and Red
Hat Linux. Python built and ran successfully on
each of these platforms.
This commit is contained in:
Jason Tishler 2002-06-04 15:07:08 +00:00
parent 1bdd9b033a
commit bc48826dc2
5 changed files with 19 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Include/Python.h
View file

@ -27,14 +27,6 @@
#include <limits.h> #include <limits.h>
#endif #endif
/* pyconfig.h may or may not define DL_IMPORT */
#ifndef DL_IMPORT /* declarations for DLL import/export */
#define DL_IMPORT(RTYPE) RTYPE
#endif
#ifndef DL_EXPORT /* declarations for DLL import/export */
#define DL_EXPORT(RTYPE) RTYPE
#endif
#if defined(__sgi) && defined(WITH_THREAD) && !defined(_SGI_MP_SOURCE) #if defined(__sgi) && defined(WITH_THREAD) && !defined(_SGI_MP_SOURCE)
#define _SGI_MP_SOURCE #define _SGI_MP_SOURCE
#endif #endif
@ -61,6 +53,14 @@
#include "pyport.h" #include "pyport.h"
/* pyconfig.h or pyport.h may or may not define DL_IMPORT */
#ifndef DL_IMPORT /* declarations for DLL import/export */
#define DL_IMPORT(RTYPE) RTYPE
#endif
#ifndef DL_EXPORT /* declarations for DLL import/export */
#define DL_EXPORT(RTYPE) RTYPE
#endif
/* Debug-mode build with pymalloc implies PYMALLOC_DEBUG. /* Debug-mode build with pymalloc implies PYMALLOC_DEBUG.
* PYMALLOC_DEBUG is in error if pymalloc is not in use. * PYMALLOC_DEBUG is in error if pymalloc is not in use.
*/ */

10
Include/pyport.h
View file

@ -384,9 +384,19 @@ extern int fsync(int fd);
extern double hypot(double, double); extern double hypot(double, double);
#endif #endif
#ifndef __CYGWIN__
#ifndef DL_IMPORT /* declarations for DLL import */ #ifndef DL_IMPORT /* declarations for DLL import */
#define DL_IMPORT(RTYPE) RTYPE #define DL_IMPORT(RTYPE) RTYPE
#endif #endif
#else /* __CYGWIN__ */
#ifdef USE_DL_IMPORT
#define DL_IMPORT(RTYPE) __declspec(dllimport) RTYPE
#define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE
#else /* !USE_DL_IMPORT */
#define DL_IMPORT(RTYPE) __declspec(dllexport) RTYPE
#define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE
#endif /* USE_DL_IMPORT */
#endif /* __CYGWIN__ */
/* If the fd manipulation macros aren't defined, /* If the fd manipulation macros aren't defined,
here is a set that should do the job */ here is a set that should do the job */

2
configure vendored
View file

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 1.318 . # From configure.in Revision: 1.319 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.53. # Generated by GNU Autoconf 2.53.
# #

10
configure.in
View file

@ -7,16 +7,6 @@ AC_CONFIG_HEADER(pyconfig.h)
# This is for stuff that absolutely must end up in pyconfig.h. # This is for stuff that absolutely must end up in pyconfig.h.
# Please use pyport.h instead, if possible. # Please use pyport.h instead, if possible.
AH_BOTTOM([ AH_BOTTOM([
#ifdef __CYGWIN__
#ifdef USE_DL_IMPORT
#define DL_IMPORT(RTYPE) __declspec(dllimport) RTYPE
#define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE
#else
#define DL_IMPORT(RTYPE) __declspec(dllexport) RTYPE
#define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE
#endif
#endif
/* Define the macros needed if on a UnixWare 7.x system. */ /* Define the macros needed if on a UnixWare 7.x system. */
#if defined(__USLC__) && defined(__SCO_VERSION__) #if defined(__USLC__) && defined(__SCO_VERSION__)
#define STRICT_SYSV_CURSES /* Don't use ncurses extensions */ #define STRICT_SYSV_CURSES /* Don't use ncurses extensions */

10
pyconfig.h.in
View file

@ -828,16 +828,6 @@
#undef volatile #undef volatile
#ifdef __CYGWIN__
#ifdef USE_DL_IMPORT
#define DL_IMPORT(RTYPE) __declspec(dllimport) RTYPE
#define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE
#else
#define DL_IMPORT(RTYPE) __declspec(dllexport) RTYPE
#define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE
#endif
#endif
/* Define the macros needed if on a UnixWare 7.x system. */ /* Define the macros needed if on a UnixWare 7.x system. */
#if defined(__USLC__) && defined(__SCO_VERSION__) #if defined(__USLC__) && defined(__SCO_VERSION__)
#define STRICT_SYSV_CURSES /* Don't use ncurses extensions */ #define STRICT_SYSV_CURSES /* Don't use ncurses extensions */