OSDN Git Service

Check for __linux__ instead of linux during compilation
authorEero Tamminen <eero.t.tamminen@intel.com>
Tue, 10 Feb 2015 14:55:22 +0000 (14:55 +0000)
committerAlan Coopersmith <alan.coopersmith@oracle.com>
Thu, 12 Feb 2015 22:10:10 +0000 (14:10 -0800)
"__linux__" is the POSIX define for checking for Linux OS, "linux" is
deprecated and apparently not supported by Android.

Besides correcting the define, patch adds error for the case OS isn't
recognized.

Signed-off-by: Eero Tamminen <eero.t.tamminen@intel.com>
v2: Drop double negative from commit msg. Spotted by Mateusz Jończyk.
[Emil Velikov: Remove irrelevant Android details from commit msg.]
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
src/common_init.c

index a127a8b..b1c0c3e 100644 (file)
@@ -52,7 +52,7 @@ pci_system_init( void )
 {
     int err = ENOSYS;
 
-#ifdef linux
+#ifdef __linux__
     err = pci_system_linux_sysfs_create();
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
     err = pci_system_freebsd_create();
@@ -64,6 +64,8 @@ pci_system_init( void )
     err = pci_system_solx_devfs_create();
 #elif defined(__GNU__) || defined(__CYGWIN__)
     err = pci_system_x86_create();
+#else
+# error "Unsupported OS"
 #endif
 
     return err;