[Patches] win64 configuration

Trent Mick trentm@ActiveState.com
Fri, 18 Feb 2000 17:54:52 -0000


This is a multi-part message in MIME format.

------=_NextPart_000_0013_01BF7A39.41F4F3C0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit



***** log message:
Add WIN64 configuration information (guarded via _WIN64). Specialized
COMPILER, PLATFORM, and SIZEOF_VOID_P.


***** disclaimer:
I confirm that, to the best of my knowledge and belief, this
contribution is free of any claims of third parties under
copyright, patent or other rights or interests ("claims").  To
the extent that I have any such claims, I hereby grant to CNRI a
nonexclusive, irrevocable, royalty-free, worldwide license to
reproduce, distribute, perform and/or display publicly, prepare
derivative versions, and otherwise use this contribution as part
of the Python software and its related documentation, or any
derivative versions thereof, at no cost to CNRI or its licensed
users, and to authorize others to do so.

I acknowledge that CNRI may, at its sole discretion, decide
whether or not to incorporate this contribution in the Python
software and its related documentation.  I further grant CNRI
permission to use my name and other identifying information
provided to CNRI by me for use in connection with the Python
software and its related documentation.

Thanks,
Trent

Trent Mick
trentm@ActiveState.com


------=_NextPart_000_0013_01BF7A39.41F4F3C0
Content-Type: text/plain;
	name="win64config.patch.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="win64config.patch.txt"

*** dist/src/PC/config.h	Fri Feb 11 17:42:59 2000
--- ../../Apps/Perlium/Python/dist/src/PC/config.h	Wed Feb 16 16:10:57 2000
***************
*** 60,66 ****
  #endif /* !MS_NO_COREDLL */
  
  #ifdef _M_IX86
! #define COMPILER "[MSC 32 bit (Intel)]"
  #elif defined(_M_ALPHA)
  #define COMPILER "[MSC 32 bit (Alpha)]"
  #else
--- 60,70 ----
  #endif /* !MS_NO_COREDLL */
  
  #ifdef _M_IX86
! # if defined(_WIN64)
! #  define COMPILER "[MSC 64 bit (Intel)]"
! # else
! #  define COMPILER "[MSC 32 bit (Intel)]"
! # endif
  #elif defined(_M_ALPHA)
  #define COMPILER "[MSC 32 bit (Alpha)]"
  #else
***************
*** 201,207 ****
  /* End of compilers - finish up */
  
  #ifdef MS_WIN32
! #define PLATFORM "win32"
  #else
  #ifdef MS_WIN16
  #define PLATFORM "win16"
--- 205,215 ----
  /* End of compilers - finish up */
  
  #ifdef MS_WIN32
! # ifdef _WIN64
! #  define PLATFORM "win64"
! # else
! #  define PLATFORM "win32"
! # endif
  #else
  #ifdef MS_WIN16
  #define PLATFORM "win16"
***************
*** 230,235 ****
--- 238,245 ----
  #define SIZEOF_LONG_LONG 8
  
  #ifdef _M_ALPHA
+ #define SIZEOF_VOID_P 8
+ #elif defined(_WIN64)
  #define SIZEOF_VOID_P 8
  #else
  #define SIZEOF_VOID_P 4

------=_NextPart_000_0013_01BF7A39.41F4F3C0--