github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-11 04:44:32 +01:00
Code Releases Activity

Remove -std=gnu99/gnu89/default dialect linux define, as it violates the

Browse Source 
C standard.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27282 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
michael 2008-07-15 00:21:32 +00:00
parent cf8d381255
commit 0589f47239
5 changed files with 8 additions and 8 deletions

8
stream/vcd_read.h

@ -9,11 +9,11 @@
#include "stream.h"
#include "libavutil/intreadwrite.h"
//=================== VideoCD ==========================
#if defined(linux) || defined(sun) || defined(__bsdi__)
#if defined(__linux__) || defined(sun) || defined(__bsdi__)
typedef struct mp_vcd_priv_st mp_vcd_priv_t;
#if defined(linux)
#if defined(__linux__)
#include <linux/cdrom.h>
#elif defined(sun)
#include <sys/cdio.h>
@ -128,7 +128,7 @@ mp_vcd_priv_t* vcd_read_toc(int fd){
}
static int vcd_read(mp_vcd_priv_t* vcd,char *mem){
#if defined(linux) || defined(__bsdi__)
#if defined(__linux__) || defined(__bsdi__)
memcpy(vcd->buf,&vcd->entry.cdte_addr.msf,sizeof(struct cdrom_msf));
if(ioctl(vcd->fd,CDROMREADRAW,vcd->buf)==-1) return 0; // EOF?
memcpy(mem,&vcd->buf[VCD_SECTOR_OFFS],VCD_SECTOR_DATA);
@ -225,7 +225,7 @@ static int sun_vcd_read(mp_vcd_priv_t* vcd, int *offset)
}
#endif /*sun*/
#else /* linux || sun || __bsdi__ */
#else /* __linux__ || sun || __bsdi__ */
#error vcd is not yet supported on this arch...

2
vidix/mtrr.c

@ -39,7 +39,7 @@
int mtrr_set_type(unsigned base,unsigned size,int type)
{
#ifdef linux
#ifdef __linux__
FILE * mtrr_fd;
char * stype;
switch(type)

2
vidix/pci.c

@ -61,7 +61,7 @@
#endif
#include "AsmMacros.h"
/* OS depended stuff */
#if defined (linux)
#if defined (__linux__)
#include "sysdep/pci_linux.c"
#elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__)
#include "sysdep/pci_freebsd.c"

2
vidix/sysdep/AsmMacros_alpha.h

@ -62,7 +62,7 @@
#ifndef MPLAYER_ASMMACROS_ALPHA_H
#define MPLAYER_ASMMACROS_ALPHA_H
#if defined (linux)
#if defined (__linux__)
#include <sys/io.h>
#elif defined (__FreeBSD__)
#include <sys/types.h>

2
vidix/sysdep/AsmMacros_ia64.h

@ -62,7 +62,7 @@
#ifndef MPLAYER_ASMMACROS_IA64_H
#define MPLAYER_ASMMACROS_IA64_H
#if defined(linux)
#if defined(__linux__)
#include <sys/io.h>
#else
#error This stuff is not ported on your system