From ee0daa0a4fdbafba224f48d7749ba13b79fa3fdc Mon Sep 17 00:00:00 2001 From: truelight Date: Sat, 19 Aug 2006 09:23:48 +0000 Subject: (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) --- thread.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'thread.h') diff --git a/thread.h b/thread.h index 66e0ceea3..98f4f5cee 100644 --- a/thread.h +++ b/thread.h @@ -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 */ -- cgit v1.2.3-70-g09d2