Changeset 5358 for trunk/src/winmm/os2timer.cpp

Timestamp:

Mar 23, 2001, 5:23:47 PM (24 years ago)

Author:

sandervl

Message:

Rewrite for DirectAudio interface

File:

• trunk/src/winmm/os2timer.cpp (modified) (6 diffs)

trunk/src/winmm/os2timer.cpp

@@ -1 @@
-/* $Id: os2timer.cpp,v 1.17 2000-10-10 21:28:56 sandervl Exp $ */
+/* $Id: os2timer.cpp,v 1.18 2001-03-23 16:23:44 sandervl Exp $ */
 
 /*
@@ -22 +22 @@
 #include <process.h>
 #include <win32type.h>
+#include <win32api.h>
 #include <wprocess.h>
 #include <misc.h>
@@ -35 +36 @@
  * Structures                                                               *
  ****************************************************************************/
-
-
-/***********************************
- * PH: fixups for missing os2win.h *
- ***********************************/
-
-extern "C"
-{
-  typedef DWORD (* CALLBACK LPTHREAD_START_ROUTINE)(LPVOID);
-  
-  DWORD WIN32API GetLastError();
-  
-  HANDLE WIN32API CreateThread(LPSECURITY_ATTRIBUTES lpsa,
-                               DWORD cbStack,
-                               LPTHREAD_START_ROUTINE lpStartAddr,
-                               LPVOID lpvThreadParm,
-                               DWORD fdwCreate,
-                               LPDWORD lpIDThread);
-  
-  VOID WIN32API ExitThread(DWORD dwExitCode);
-  
-  BOOL WIN32API TerminateThread(HANDLE hThread,
-                                DWORD dwExitCode);
-  
-  BOOL WIN32API SetEvent   (HANDLE hEvent);
-    
-  BOOL WIN32API PulseEvent (HANDLE hEvent);
-    
-}
+  
 
 /****************************************************************************
@@ -69 +42 @@
  ****************************************************************************/
 
-static DWORD _System TimerHlpHandler(LPVOID timer);
+static DWORD WIN32API TimerHlpHandler(LPVOID timer);
 
 
@@ -282 +255 @@
   hTimerThread = CreateThread(NULL,
                               0x4000,
-                              (LPTHREAD_START_ROUTINE)TimerHlpHandler,
+                              TimerHlpHandler,
                               (LPVOID)this,
                               0, // thread creation flags
@@ -476 +449 @@
 //******************************************************************************
 //******************************************************************************
-//static void _Optlink TimerHlpHandler(void *timer)
-static DWORD _System TimerHlpHandler(LPVOID timer)
+static DWORD WIN32API TimerHlpHandler(LPVOID timer)
 {
   ((OS2Timer *)timer)->TimerHandler();
 
-  //_endthread(); isn't really required
   return 0;
 }