[vlc-devel] commit: No need for SYS_LINUX ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Mon May 26 19:06:46 2008 +0300| [e5fcb7ff3e6764a575271ad84377585036836361]

No need for SYS_LINUX

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

 src/interface/intf_eject.c |    8 ++++----
 src/misc/cpu.c             |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/interface/intf_eject.c b/src/interface/intf_eject.c
index fa63882..866a9fb 100644
--- a/src/interface/intf_eject.c
+++ b/src/interface/intf_eject.c
@@ -47,7 +47,7 @@
 #   include <dvd.h>
 #endif
 
-#if defined(SYS_LINUX) && defined(HAVE_LINUX_VERSION_H)
+#if defined(__linux__) && defined(HAVE_LINUX_VERSION_H)
 #   include <linux/version.h>
     /* handy macro found in 2.1 kernels, but not in older ones */
 #   ifndef KERNEL_VERSION
@@ -80,7 +80,7 @@
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-#if defined(SYS_LINUX) && defined(HAVE_LINUX_VERSION_H)
+#if defined(__linux__) && defined(HAVE_LINUX_VERSION_H)
 static int EjectSCSI ( int i_fd );
 #endif
 
@@ -192,7 +192,7 @@ int __intf_Eject( vlc_object_t *p_this, const char *psz_device )
         return VLC_EGENERIC;
     }
 
-#if defined(SYS_LINUX) && defined(HAVE_LINUX_VERSION_H)
+#if defined(__linux__) && defined(HAVE_LINUX_VERSION_H)
     /* Try a simple ATAPI eject */
     i_ret = ioctl( i_fd, CDROMEJECT, 0 );
 
@@ -222,7 +222,7 @@ int __intf_Eject( vlc_object_t *p_this, const char *psz_device )
 
 /* The following functions are local */
 
-#if defined(SYS_LINUX) && defined(HAVE_LINUX_VERSION_H)
+#if defined(__linux__) && defined(HAVE_LINUX_VERSION_H)
 /*****************************************************************************
  * Eject using SCSI commands. Return 0 if successful
  *****************************************************************************/
diff --git a/src/misc/cpu.c b/src/misc/cpu.c
index 7f75bf2..82b42c7 100644
--- a/src/misc/cpu.c
+++ b/src/misc/cpu.c
@@ -335,7 +335,7 @@ static void SigHandler( int i_signal )
                      "operating system.\n", psz_capability );
     fprintf( stderr, "         some optimizations will be disabled unless "
                      "you upgrade your OS\n" );
-#   if defined( SYS_LINUX )
+#   if defined( __linux__ )
     fprintf( stderr, "         (for instance Linux kernel 2.4.x or later)\n" );
 #   endif
 #endif