*** win/tkWin32Dll.c.orig	Fri Apr 16 03:51:48 1999
--- win/tkWin32Dll.c	Sun Jan 16 17:43:06 2000
***************
*** 13,26 ****
  
  #include "tkWinInt.h"
  
! static int tkPlatformId;
  
- /*
-  * The following declaration is for the VC++ DLL entry point.
-  */
- 
- BOOL APIENTRY		DllMain _ANSI_ARGS_((HINSTANCE hInst,
- 			    DWORD reason, LPVOID reserved));
  
  /*
   *----------------------------------------------------------------------
--- 13,22 ----
  
  #include "tkWinInt.h"
  
! #if defined(_MSC_VER) || defined(__GNUC__)
! #define DllEntryPoint DllMain
! #endif
  
  
  /*
   *----------------------------------------------------------------------
***************
*** 32,63 ****
   *	routine.
   *
   * Results:
!  *	See DllMain.
!  *
!  * Side effects:
!  *	See DllMain.
!  *
!  *----------------------------------------------------------------------
!  */
! 
! BOOL APIENTRY
! DllEntryPoint(hInst, reason, reserved)
!     HINSTANCE hInst;		/* Library instance handle. */
!     DWORD reason;		/* Reason this function is being called. */
!     LPVOID reserved;		/* Not used. */
! {
!     return DllMain(hInst, reason, reserved);
! }
! 
! /*
!  *----------------------------------------------------------------------
!  *
!  * DllMain --
!  *
!  *	DLL entry point.
!  *
!  * Results:
!  *	TRUE on sucess, FALSE on failure.
   *
   * Side effects:
   *	None.
--- 28,34 ----
   *	routine.
   *
   * Results:
!  *	TRUE on success, FALSE otherwise.
   *
   * Side effects:
   *	None.
***************
*** 66,77 ****
   */
  
  BOOL APIENTRY
! DllMain(hInstance, reason, reserved)
!     HINSTANCE hInstance;
!     DWORD reason;
!     LPVOID reserved;
  {
-     OSVERSIONINFO os;
  
      /*
       * If we are attaching to the DLL from a new process, tell Tk about
--- 37,47 ----
   */
  
  BOOL APIENTRY
! DllEntryPoint (
!     HINSTANCE hInstance,	/* Library instance handle. */
!     DWORD reason,		/* Reason this function is being called. */
!     LPVOID reserved)		/* Not used. */
  {
  
      /*
       * If we are attaching to the DLL from a new process, tell Tk about
***************
*** 80,119 ****
       */
      
      if (reason == DLL_PROCESS_ATTACH) {
- 	os.dwOSVersionInfoSize = sizeof(os);
- 	GetVersionEx(&os);
- 	tkPlatformId = os.dwPlatformId;
- 
          TkWinXInit(hInstance);
      } else if (reason == DLL_PROCESS_DETACH) {
          TkWinXCleanup(hInstance);
      }
      return(TRUE);
  }
- 
- /*
-  *----------------------------------------------------------------------
-  *
-  * TkWinGetPlatformId --
-  *
-  *	Determines whether running under NT, 95, or Win32s, to allow 
-  *	runtime conditional code.
-  *
-  * Results:
-  *	The return value is one of:
-  *	    VER_PLATFORM_WIN32s		Win32s on Windows 3.1. 
-  *	    VER_PLATFORM_WIN32_WINDOWS	Win32 on Windows 95.
-  *	    VER_PLATFORM_WIN32_NT	Win32 on Windows NT
-  *
-  * Side effects:
-  *	None.
-  *
-  *----------------------------------------------------------------------
-  */
- 
- int		
- TkWinGetPlatformId()
- {
-     return tkPlatformId;
- }
- 
--- 50,58 ----
