[vlc-commits] commit: "#if HAVE_FOO" -> "#ifdef HAVE_FOO" (Pierre Ynard )

[git at videolan.org]

vlc | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Wed May  5 13:42:28 2010 +0200| [69d7fdea2da6f773fd7993f78c2bea494eb2d819] | committer: Pierre Ynard 

"#if HAVE_FOO" -> "#ifdef HAVE_FOO"

This fixes some warnings.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=69d7fdea2da6f773fd7993f78c2bea494eb2d819
---

 bin/rootwrap.c        |    2 +-
 modules/access/http.c |    2 +-
 src/misc/cpu.c        |    2 +-
 src/misc/messages.c   |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/rootwrap.c b/bin/rootwrap.c
index e95784c..1527406 100644
--- a/bin/rootwrap.c
+++ b/bin/rootwrap.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 #define _XPG4_2 /* ancilliary data on Solaris */
diff --git a/modules/access/http.c b/modules/access/http.c
index a23a2f8..d0a53d7 100644
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -449,7 +449,7 @@ static int OpenWithCookies( vlc_object_t *p_this, const char *psz_access,
                           "in registry." );
         }
     }
-#elif HAVE_GETENV
+#elif defined( HAVE_GETENV )
     else
     {
         psz = getenv( "http_proxy" );
diff --git a/src/misc/cpu.c b/src/misc/cpu.c
index 9022868..fc6e437 100644
--- a/src/misc/cpu.c
+++ b/src/misc/cpu.c
@@ -335,7 +335,7 @@ unsigned vlc_GetCPUCount(void)
         system_mask >>= 1;
     }
     return count;
-#elif HAVE_SCHED_GETAFFINITY
+#elif defined(HAVE_SCHED_GETAFFINITY)
     cpu_set_t cpu;
     CPU_ZERO(&cpu);
     if (sched_getaffinity(0, sizeof(cpu), &cpu) < 0)
diff --git a/src/misc/messages.c b/src/misc/messages.c
index 4ef2b28..906b489 100644
--- a/src/misc/messages.c
+++ b/src/misc/messages.c
@@ -37,7 +37,7 @@
 #include <stdarg.h>                                       /* va_list for BSD */
 #ifdef __APPLE__
 # include <xlocale.h>
-#elif HAVE_LOCALE_H
+#elif defined(HAVE_LOCALE_H)
 # include <locale.h>
 #endif
 #include <errno.h>                                                  /* errno */