*** \MSSDK\INCLUDE\WinBase.h	Thu Aug  6 18:28:36 1998
--- WinBase.h	Sun Jan  3 14:47:05 1999
***************
*** 270,282 ****
  } SYSTEMTIME, *PSYSTEMTIME, *LPSYSTEMTIME;
  
  
! typedef DWORD (WINAPI *PTHREAD_START_ROUTINE)(
      LPVOID lpThreadParameter
      );
  typedef PTHREAD_START_ROUTINE LPTHREAD_START_ROUTINE;
  
  #if(_WIN32_WINNT >= 0x0400)
! typedef VOID (WINAPI *PFIBER_START_ROUTINE)(
      LPVOID lpFiberParameter
      );
  typedef PFIBER_START_ROUTINE LPFIBER_START_ROUTINE;
--- 270,282 ----
  } SYSTEMTIME, *PSYSTEMTIME, *LPSYSTEMTIME;
  
  
! typedef DWORD WINAPI (*PTHREAD_START_ROUTINE)(
      LPVOID lpThreadParameter
      );
  typedef PTHREAD_START_ROUTINE LPTHREAD_START_ROUTINE;
  
  #if(_WIN32_WINNT >= 0x0400)
! typedef VOID WINAPI (*PFIBER_START_ROUTINE)(
      LPVOID lpFiberParameter
      );
  typedef PFIBER_START_ROUTINE LPFIBER_START_ROUTINE;
***************
*** 513,520 ****
          struct {
              WORD wProcessorArchitecture;
              WORD wReserved;
!         };
!     };
      DWORD dwPageSize;
      LPVOID lpMinimumApplicationAddress;
      LPVOID lpMaximumApplicationAddress;
--- 513,520 ----
          struct {
              WORD wProcessorArchitecture;
              WORD wReserved;
!         }s;
!     } u;
      DWORD dwPageSize;
      LPVOID lpMinimumApplicationAddress;
      LPVOID lpMaximumApplicationAddress;
***************
*** 1631,1637 ****
              LPVOID lpFirstBlock;
              LPVOID lpLastBlock;
          } Region;
!     };
  } PROCESS_HEAP_ENTRY, *LPPROCESS_HEAP_ENTRY, *PPROCESS_HEAP_ENTRY;
  
  #define PROCESS_HEAP_REGION             0x0001
--- 1631,1637 ----
              LPVOID lpFirstBlock;
              LPVOID lpLastBlock;
          } Region;
!     } u;
  } PROCESS_HEAP_ENTRY, *LPPROCESS_HEAP_ENTRY, *PPROCESS_HEAP_ENTRY;
  
  #define PROCESS_HEAP_REGION             0x0001
***************
*** 1892,1898 ****
      IN struct _EXCEPTION_POINTERS *ExceptionInfo
      );
  
! typedef LONG (WINAPI *PTOP_LEVEL_EXCEPTION_FILTER)(
      struct _EXCEPTION_POINTERS *ExceptionInfo
      );
  typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER;
--- 1892,1898 ----
      IN struct _EXCEPTION_POINTERS *ExceptionInfo
      );
  
! typedef LONG WINAPI (*PTOP_LEVEL_EXCEPTION_FILTER)(
      struct _EXCEPTION_POINTERS *ExceptionInfo
      );
  typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER;
***************
*** 3903,3909 ****
  
  typedef
  VOID
! (WINAPI *LPOVERLAPPED_COMPLETION_ROUTINE)(
      DWORD dwErrorCode,
      DWORD dwNumberOfBytesTransfered,
      LPOVERLAPPED lpOverlapped
--- 3903,3909 ----
  
  typedef
  VOID
! WINAPI (*LPOVERLAPPED_COMPLETION_ROUTINE)(
      DWORD dwErrorCode,
      DWORD dwNumberOfBytesTransfered,
      LPOVERLAPPED lpOverlapped
***************
*** 4799,4809 ****
  #endif // !UNICODE
  
  #ifdef STRICT
! typedef BOOL (CALLBACK* ENUMRESTYPEPROC)(HMODULE hModule, LPTSTR lpType,
          LONG_PTR lParam);
! typedef BOOL (CALLBACK* ENUMRESNAMEPROC)(HMODULE hModule, LPCTSTR lpType,
          LPTSTR lpName, LONG_PTR lParam);
! typedef BOOL (CALLBACK* ENUMRESLANGPROC)(HMODULE hModule, LPCTSTR lpType,
          LPCTSTR lpName, WORD  wLanguage, LONG_PTR lParam);
  #else
  typedef FARPROC ENUMRESTYPEPROC;
--- 4799,4809 ----
  #endif // !UNICODE
  
  #ifdef STRICT
! typedef BOOL CALLBACK (*ENUMRESTYPEPROC)(HMODULE hModule, LPTSTR lpType,
          LONG_PTR lParam);
! typedef BOOL CALLBACK (*ENUMRESNAMEPROC)(HMODULE hModule, LPCTSTR lpType,
          LPTSTR lpName, LONG_PTR lParam);
! typedef BOOL CALLBACK (*ENUMRESLANGPROC)(HMODULE hModule, LPCTSTR lpType,
          LPCTSTR lpName, WORD  wLanguage, LONG_PTR lParam);
  #else
  typedef FARPROC ENUMRESTYPEPROC;
***************
*** 5974,5980 ****
  #if(_WIN32_WINNT >= 0x0400)
  typedef
  DWORD
! (WINAPI *LPPROGRESS_ROUTINE)(
      LARGE_INTEGER TotalFileSize,
      LARGE_INTEGER TotalBytesTransferred,
      LARGE_INTEGER StreamSize,
--- 5974,5980 ----
  #if(_WIN32_WINNT >= 0x0400)
  typedef
  DWORD
! WINAPI (*LPPROGRESS_ROUTINE)(
      LARGE_INTEGER TotalFileSize,
      LARGE_INTEGER TotalBytesTransferred,
      LARGE_INTEGER StreamSize,