Mercurial > mplayer.hg
changeset 28364:3e3bd9da4c7e
Use OS preprocessor checks with '#if defined()' consistently.
Avoids undefined preprocessor directives warnings.
| author | diego |
|---|---|
| date | Fri, 30 Jan 2009 23:29:39 +0000 |
| parents | 7baa7292f575 |
| children | 7baef388c45b |
| files | cpudetect.c get_path.c |
| diffstat | 2 files changed, 10 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/cpudetect.c Fri Jan 30 23:22:29 2009 +0000 +++ b/cpudetect.c Fri Jan 30 23:29:39 2009 +0000 @@ -18,27 +18,17 @@ #include <sys/param.h> #include <sys/sysctl.h> #include <machine/cpu.h> -#endif - -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__APPLE__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__APPLE__) #include <sys/types.h> #include <sys/sysctl.h> -#endif - -#ifdef __linux__ +#elif defined(__linux__) #include <signal.h> -#endif - -#if defined(__MINGW32__) || defined(__CYGWIN__) +#elif defined(__MINGW32__) || defined(__CYGWIN__) #include <windows.h> -#endif - -#ifdef __OS2__ +#elif defined(__OS2__) #define INCL_DOS #include <os2.h> -#endif - -#ifdef __AMIGAOS4__ +#elif defined(__AMIGAOS4__) #include <proto/exec.h> #endif @@ -475,7 +465,7 @@ #ifdef __APPLE__ #include <sys/sysctl.h> -#elif __AMIGAOS4__ +#elif defined(__AMIGAOS4__) /* nothing */ #else #include <signal.h> @@ -529,7 +519,7 @@ if (has_vu != 0) caps->hasAltiVec = 1; } -#elif __AMIGAOS4__ +#elif defined(__AMIGAOS4__) ULONG result = 0; GetCPUInfoTags(GCIT_VectorUnit, &result, TAG_DONE);
--- a/get_path.c Fri Jan 30 23:22:29 2009 +0000 +++ b/get_path.c Fri Jan 30 23:29:39 2009 +0000 @@ -18,12 +18,12 @@ #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> -#elif __MINGW32__ +#elif defined(__MINGW32__) #include <windows.h> -#elif __CYGWIN__ +#elif defined(__CYGWIN__) #include <windows.h> #include <sys/cygwin.h> -#elif __OS2__ +#elif defined(__OS2__) #define INCL_DOS #include <os2.h> #endif