X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Flibrary%2Fprocesses%2Fethread.h;h=ddc11f8419a47a89bdaae421cc093762d499afa5;hb=d60e7a2467ab8be80a06ba670ccba1819ca7c0e4;hp=9adab46514ce7a940a405f3a540a612485e3570a;hpb=3ea085ec301ed1399dfa1e9f3a240312dc95410b;p=feisty_meow.git diff --git a/nucleus/library/processes/ethread.h b/nucleus/library/processes/ethread.h index 9adab465..ddc11f84 100644 --- a/nucleus/library/processes/ethread.h +++ b/nucleus/library/processes/ethread.h @@ -20,12 +20,6 @@ #include -#ifndef __APPLE__ -#ifdef __UNIX__ -// typedef long unsigned int pthread_t; -#endif -#endif - namespace processes { //! Provides a platform-independent object for adding threads to a program. @@ -154,9 +148,9 @@ private: bool _thread_active; //!< is the thread currently performing? bool _stop_thread; //!< true if the thread should stop now. void *_data; //!< holds the thread's link back to whatever. -#ifdef __UNIX__ +#ifndef _MSC_VER pthread_t *_handle; //!< thread structure for our thread. -#elif defined(__WIN32__) +#else uintptr_t _handle; //!< thread handle for the active thread, or zero. #endif int _sleep_time; //!< threads perform at roughly this interval. @@ -165,10 +159,10 @@ private: timed_thread_types _how; //!< how is the period evaluated? // the OS level thread functions. -#ifdef __UNIX__ +#ifndef _MSC_VER static void *periodic_thread_driver(void *hidden_pointer); static void *one_shot_thread_driver(void *hidden_pointer); -#elif defined(__WIN32__) +#else static void periodic_thread_driver(void *hidden_pointer); static void one_shot_thread_driver(void *hidden_pointer); #endif