[Python-checkins] python/dist/src configure,1.309,1.310 configure.in,1.319,1.320 pyconfig.h.in,1.36,1.37

jlt63@users.sourceforge.net jlt63@users.sourceforge.net
Tue, 04 Jun 2002 08:06:09 -0700


Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv17908

Modified Files:
	configure configure.in pyconfig.h.in 
Log Message:
Patch #555929: Cygwin AH_BOTTOM cleanup patch (*** version 2 ***)

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.


Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.309
retrieving revision 1.310
diff -C2 -d -r1.309 -r1.310
*** configure	1 Jun 2002 21:39:58 -0000	1.309
--- configure	4 Jun 2002 15:05:56 -0000	1.310
***************
*** 1,4 ****
  #! /bin/sh
! # From configure.in Revision: 1.318 .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.53.
--- 1,4 ----
  #! /bin/sh
! # From configure.in Revision: 1.319 .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.53.

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.319
retrieving revision 1.320
diff -C2 -d -r1.319 -r1.320
*** configure.in	1 Jun 2002 21:39:58 -0000	1.319
--- configure.in	4 Jun 2002 15:06:02 -0000	1.320
***************
*** 8,21 ****
  # Please use pyport.h instead, if possible.
  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. */
  #if defined(__USLC__) && defined(__SCO_VERSION__)
--- 8,11 ----

Index: pyconfig.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/pyconfig.h.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** pyconfig.h.in	27 May 2002 15:08:23 -0000	1.36
--- pyconfig.h.in	4 Jun 2002 15:06:05 -0000	1.37
***************
*** 829,842 ****
  
  
- #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. */
  #if defined(__USLC__) && defined(__SCO_VERSION__)
--- 829,832 ----