Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
e5fcb7ff
Commit
e5fcb7ff
authored
May 26, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
No need for SYS_LINUX
parent
d3cccc0b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
src/interface/intf_eject.c
src/interface/intf_eject.c
+4
-4
src/misc/cpu.c
src/misc/cpu.c
+1
-1
No files found.
src/interface/intf_eject.c
View file @
e5fcb7ff
...
@@ -47,7 +47,7 @@
...
@@ -47,7 +47,7 @@
# include <dvd.h>
# include <dvd.h>
#endif
#endif
#if defined(
SYS_LINUX
) && defined(HAVE_LINUX_VERSION_H)
#if defined(
__linux__
) && defined(HAVE_LINUX_VERSION_H)
# include <linux/version.h>
# include <linux/version.h>
/* handy macro found in 2.1 kernels, but not in older ones */
/* handy macro found in 2.1 kernels, but not in older ones */
# ifndef KERNEL_VERSION
# ifndef KERNEL_VERSION
...
@@ -80,7 +80,7 @@
...
@@ -80,7 +80,7 @@
/*****************************************************************************
/*****************************************************************************
* Local prototypes
* 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
);
static
int
EjectSCSI
(
int
i_fd
);
#endif
#endif
...
@@ -192,7 +192,7 @@ int __intf_Eject( vlc_object_t *p_this, const char *psz_device )
...
@@ -192,7 +192,7 @@ int __intf_Eject( vlc_object_t *p_this, const char *psz_device )
return
VLC_EGENERIC
;
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 */
/* Try a simple ATAPI eject */
i_ret
=
ioctl
(
i_fd
,
CDROMEJECT
,
0
);
i_ret
=
ioctl
(
i_fd
,
CDROMEJECT
,
0
);
...
@@ -222,7 +222,7 @@ int __intf_Eject( vlc_object_t *p_this, const char *psz_device )
...
@@ -222,7 +222,7 @@ int __intf_Eject( vlc_object_t *p_this, const char *psz_device )
/* The following functions are local */
/* 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
* Eject using SCSI commands. Return 0 if successful
*****************************************************************************/
*****************************************************************************/
...
...
src/misc/cpu.c
View file @
e5fcb7ff
...
@@ -335,7 +335,7 @@ static void SigHandler( int i_signal )
...
@@ -335,7 +335,7 @@ static void SigHandler( int i_signal )
"operating system.
\n
"
,
psz_capability
);
"operating system.
\n
"
,
psz_capability
);
fprintf
(
stderr
,
" some optimizations will be disabled unless "
fprintf
(
stderr
,
" some optimizations will be disabled unless "
"you upgrade your OS
\n
"
);
"you upgrade your OS
\n
"
);
# if defined(
SYS_LINUX
)
# if defined(
__linux__
)
fprintf
(
stderr
,
" (for instance Linux kernel 2.4.x or later)
\n
"
);
fprintf
(
stderr
,
" (for instance Linux kernel 2.4.x or later)
\n
"
);
# endif
# endif
#endif
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment