[Python-checkins] CVS: python/dist/src/PC import_nt.c,1.10,1.11

[Guido van Rossum]

Update of /projects/cvsroot/python/dist/src/PC
In directory eric:/projects/python/develop/guido/src/PC

Modified Files:
	import_nt.c 
Log Message:
Get rid of Win32s check.


Index: import_nt.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PC/import_nt.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** import_nt.c	1999/01/14 22:40:30	1.10
--- import_nt.c	2000/04/04 22:48:55	1.11
***************
*** 15,34 ****
  extern const char *PyWin_DLLVersionString; // a string loaded from the DLL at startup.
  
- /* Return whether this is Win32s, i.e., Win32 API on Win 3.1(1).
-    This function is exported! */
- 
- BOOL PyWin_IsWin32s()
- {
- 	static BOOL bIsWin32s = -1; /* flag as "not yet looked" */
- 
- 	if (bIsWin32s == -1) {
- 		OSVERSIONINFO ver;
- 		ver.dwOSVersionInfoSize = sizeof(ver);
- 		GetVersionEx(&ver);
- 		bIsWin32s = ver.dwPlatformId == VER_PLATFORM_WIN32s;
- 	}
- 	return bIsWin32s;
- }
- 
  FILE *PyWin_FindRegisteredModule( const char *moduleName, struct filedescr **ppFileDesc, char *pathBuf, int pathLen)
  {
--- 15,18 ----
***************
*** 44,48 ****
  	struct filedescr *fdp = NULL;
  	FILE *fp;
! 	HKEY keyBase = PyWin_IsWin32s() ? HKEY_CLASSES_ROOT : HKEY_LOCAL_MACHINE;
  	int modNameSize;
  	long regStat;
--- 28,32 ----
  	struct filedescr *fdp = NULL;
  	FILE *fp;
! 	HKEY keyBase = HKEY_LOCAL_MACHINE;
  	int modNameSize;
  	long regStat;