Changeset e5fcb7ff3e6764a575271ad84377585036836361

Show
Ignore:
Timestamp:
05/26/08 18:06:46 (3 months ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1211818006 +0300
git-parent:

[d3cccc0bd127932962cf22df25129167f56ba46b]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1211818006 +0300
Message:

No need for SYS_LINUX

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/interface/intf_eject.c

    r7e5f8f8 re5fcb7f  
    4848#endif 
    4949 
    50 #if defined(SYS_LINUX) && defined(HAVE_LINUX_VERSION_H) 
     50#if defined(__linux__) && defined(HAVE_LINUX_VERSION_H) 
    5151#   include <linux/version.h> 
    5252    /* handy macro found in 2.1 kernels, but not in older ones */ 
    …… 
    8181 * Local prototypes 
    8282 *****************************************************************************/ 
    83 #if defined(SYS_LINUX) && defined(HAVE_LINUX_VERSION_H) 
     83#if defined(__linux__) && defined(HAVE_LINUX_VERSION_H) 
    8484static int EjectSCSI ( int i_fd ); 
    8585#endif 
    …… 
    193193    } 
    194194 
    195 #if defined(SYS_LINUX) && defined(HAVE_LINUX_VERSION_H) 
     195#if defined(__linux__) && defined(HAVE_LINUX_VERSION_H) 
    196196    /* Try a simple ATAPI eject */ 
    197197    i_ret = ioctl( i_fd, CDROMEJECT, 0 ); 
    …… 
    223223/* The following functions are local */ 
    224224 
    225 #if defined(SYS_LINUX) && defined(HAVE_LINUX_VERSION_H) 
     225#if defined(__linux__) && defined(HAVE_LINUX_VERSION_H) 
    226226/***************************************************************************** 
    227227 * Eject using SCSI commands. Return 0 if successful 

  • src/misc/cpu.c

    r35d8114 re5fcb7f  
    336336    fprintf( stderr, "         some optimizations will be disabled unless " 
    337337                     "you upgrade your OS\n" ); 
    338 #   if defined( SYS_LINUX ) 
     338#   if defined( __linux__ ) 
    339339    fprintf( stderr, "         (for instance Linux kernel 2.4.x or later)\n" ); 
    340340#   endif