[gray-matter] r1607 committed - this works better. . I don't have time to figure out why.

[codesite...@google.com]

Revision: 1607
Author: protonspring
Date: Wed Jul 28 11:04:14 2010
Log: this works better. . I don't have time to figure out why.

http://code.google.com/p/gray-matter/source/detail?r=1607

Modified:
/trunk/inc/library.h
/trunk/src/library.cpp

=======================================
--- /trunk/inc/library.h Wed Jul 28 10:48:07 2010
+++ /trunk/inc/library.h Wed Jul 28 11:04:14 2010
@@ -123,9 +123,6 @@
static int timer_function(void (*function)(void *), void *data);
static int timer_set(int csec);
static int timer_cancel();
-#if defined(LINUX) || defined(OS_X)
- void timer_handler(int num);
-#endif

// Function prototypes related to 64-bit pseudo-random number generation
and
// bitwise operations:
@@ -141,8 +138,11 @@
static void *callback_data;
};

+#if defined(LINUX) || defined(OS_X)
+ void timer_handler(int num);
+#endif
#if defined(_MINGW_WINDOWS)
- DWORD timer_handler(LPVOID arg);
+ unsigned long timer_handler(LPVOID arg);
#endif

#endif
=======================================
--- /trunk/src/library.cpp Wed Jul 28 10:48:07 2010
+++ /trunk/src/library.cpp Wed Jul 28 11:04:14 2010
@@ -286,13 +286,13 @@
|
timer_handler() |

\*----------------------------------------------------------------------------*/
#if defined(LINUX) || defined(OS_X)
-void Library::timer_handler(int num)
+void timer_handler(int num)
{

// On Linux and OS X, the alarm has sounded. Call the previously specified
// function.

- (*callback)(callback_data);
+ (*Library::callback)(Library::callback_data);
}
#elif defined(_MINGW_WINDOWS)
DWORD timer_handler(LPVOID arg)