diff options
author | truelight <truelight@openttd.org> | 2006-08-19 09:23:48 +0000 |
---|---|---|
committer | truelight <truelight@openttd.org> | 2006-08-19 09:23:48 +0000 |
commit | ee0daa0a4fdbafba224f48d7749ba13b79fa3fdc (patch) | |
tree | 7d50ad628902e6ab53e9f809daaf66e7ca463f50 /thread.h | |
parent | 7cfd3eb61834ee3d4c5037b0a3ffc71089b9564a (diff) | |
download | openttd-ee0daa0a4fdbafba224f48d7749ba13b79fa3fdc.tar.xz |
(svn r5943) -Merge TGP (part r5725): -Codechange: renamed Thread to OTTDThread, as Windows
(who else) uses Thread in winbase.h, and starts complaining if you define it
otherwise (with weird, undefined errors) (tnx Arnau and Rubidium)
Diffstat (limited to 'thread.h')
-rw-r--r-- | thread.h | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -3,11 +3,11 @@ #ifndef THREAD_H #define THREAD_H -typedef struct Thread Thread; +typedef struct OTTDThread OTTDThread; -typedef void* (*ThreadFunc)(void*); +typedef void* (*OTTDThreadFunc)(void*); -Thread* OTTDCreateThread(ThreadFunc, void*); -void* OTTDJoinThread(Thread*); +OTTDThread* OTTDCreateThread(OTTDThreadFunc, void*); +void* OTTDJoinThread(OTTDThread*); #endif /* THREAD_H */ |