From 26ed1ebeb95caec8d733a6a91e71e31312a8eb06 Mon Sep 17 00:00:00 2001 From: rpj Date: Mon, 30 May 2011 00:30:56 +0000 Subject: Compiler directive cleanups --- sched.h | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'sched.h') diff --git a/sched.h b/sched.h index b85a967..7c4bd1b 100644 --- a/sched.h +++ b/sched.h @@ -36,37 +36,37 @@ * if not, write to the Free Software Foundation, Inc., * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#ifndef _SCHED_H +#if !defined(_SCHED_H) #define _SCHED_H -#undef PTW32_LEVEL +#undef PTW32_SCHED_LEVEL #if defined(_POSIX_SOURCE) -#define PTW32_LEVEL 0 +#define PTW32_SCHED_LEVEL 0 /* Early POSIX */ #endif #if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309 -#undef PTW32_LEVEL -#define PTW32_LEVEL 1 +#undef PTW32_SCHED_LEVEL +#define PTW32_SCHED_LEVEL 1 /* Include 1b, 1c and 1d */ #endif #if defined(INCLUDE_NP) -#undef PTW32_LEVEL -#define PTW32_LEVEL 2 +#undef PTW32_SCHED_LEVEL +#define PTW32_SCHED_LEVEL 2 /* Include Non-Portable extensions */ #endif -#define PTW32_LEVEL_MAX 3 +#define PTW32_SCHED_LEVEL_MAX 3 #if ( defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112 ) || !defined(PTW32_LEVEL) -#define PTW32_LEVEL PTW32_LEVEL_MAX +#define PTW32_SCHED_LEVEL PTW32_SCHED_LEVEL_MAX /* Include everything */ #endif -#if __GNUC__ && ! defined (__declspec) +#if defined(__GNUC__) && !defined(__declspec) # error Please upgrade your GNU compiler to one that supports __declspec. #endif @@ -77,7 +77,7 @@ * be imported correctly. */ #if !defined(PTW32_STATIC_LIB) -# ifdef PTW32_BUILD +# if defined(PTW32_BUILD) # define PTW32_DLLPORT __declspec (dllexport) # else # define PTW32_DLLPORT __declspec (dllimport) @@ -91,7 +91,7 @@ * which is only used when building the pthread-win32 libraries. */ -#ifndef PTW32_CONFIG_H +#if !defined(PTW32_CONFIG_H) # if defined(WINCE) # define NEED_ERRNO # define NEED_SEM @@ -108,16 +108,16 @@ * */ -#if PTW32_LEVEL >= PTW32_LEVEL_MAX -#ifdef NEED_ERRNO +#if PTW32_SCHED_LEVEL >= PTW32_SCHED_LEVEL_MAX +#if defined(NEED_ERRNO) #include "need_errno.h" #else #include #endif -#endif /* PTW32_LEVEL >= PTW32_LEVEL_MAX */ +#endif /* PTW32_SCHED_LEVEL >= PTW32_SCHED_LEVEL_MAX */ #if (defined(__MINGW64__) || defined(__MINGW32__)) || defined(_UWIN) -# if PTW32_LEVEL >= PTW32_LEVEL_MAX +# if PTW32_SCHED_LEVEL >= PTW32_SCHED_LEVEL_MAX /* For pid_t */ # include /* Required by Unix 98 */ @@ -143,7 +143,7 @@ struct sched_param { int sched_priority; }; -#ifdef __cplusplus +#if defined(__cplusplus) extern "C" { #endif /* __cplusplus */ @@ -172,12 +172,12 @@ PTW32_DLLPORT int __cdecl sched_getscheduler (pid_t pid); ( errno = ENOTSUP, (int) -1 ) -#ifdef __cplusplus +#if defined(__cplusplus) } /* End of extern "C" */ #endif /* __cplusplus */ -#undef PTW32_LEVEL -#undef PTW32_LEVEL_MAX +#undef PTW32_SCHED_LEVEL +#undef PTW32_SCHED_LEVEL_MAX #endif /* !_SCHED_H */ -- cgit v1.2.3