diff options
| author | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-06-07 11:47:33 +0000 |
|---|---|---|
| committer | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-06-07 11:47:33 +0000 |
| commit | 494da54eaf11c759f05c703aa635ce1f0324cbb8 (patch) | |
| tree | e088c27cc6728b6d1bc4dee49fb0d60c9a10abc2 /vidix | |
| parent | d47186c5d85318df77cb67050eb08af1de3d4bd6 (diff) | |
| download | mpv-494da54eaf11c759f05c703aa635ce1f0324cbb8.tar.bz2 mpv-494da54eaf11c759f05c703aa635ce1f0324cbb8.tar.xz | |
remove C++ inclusion guard from vidix headers
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27011 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vidix')
| -rw-r--r-- | vidix/dha.h | 8 | ||||
| -rw-r--r-- | vidix/pci_db2c.awk | 6 | ||||
| -rw-r--r-- | vidix/vidix.h | 8 | ||||
| -rw-r--r-- | vidix/vidixlib.h | 8 |
4 files changed, 0 insertions, 30 deletions
diff --git a/vidix/dha.h b/vidix/dha.h index 7acc3c6c73..eb2a269c46 100644 --- a/vidix/dha.h +++ b/vidix/dha.h @@ -36,10 +36,6 @@ #ifndef MPLAYER_DHA_H #define MPLAYER_DHA_H -#ifdef __cplusplus -extern "C" { -#endif - #ifndef DEV_SVGA #define DEV_SVGA "/dev/svga" #endif @@ -92,8 +88,4 @@ extern void unmap_phys_mem(void *ptr, unsigned long size); #define MTRR_TYPE_WRBACK 6 extern int mtrr_set_type(unsigned base,unsigned size,int type); -#ifdef __cplusplus -} -#endif - #endif /* MPLAYER_DHA_H */ diff --git a/vidix/pci_db2c.awk b/vidix/pci_db2c.awk index 4f6a084bda..3d10297652 100644 --- a/vidix/pci_db2c.awk +++ b/vidix/pci_db2c.awk @@ -145,9 +145,6 @@ function print_head( out_file) function print_name_struct(out_file) { - print "#ifdef __cplusplus" >out_file - print "extern \"C\" {" >out_file - print "#endif" >out_file print "">out_file print "struct device_id_s" >out_file print "{" >out_file @@ -164,9 +161,6 @@ function print_name_struct(out_file) print "extern const char *pci_vendor_name(unsigned short id);">out_file print "extern const char *pci_device_name(unsigned short vendor_id, unsigned short device_id);">out_file print "">out_file - print "#ifdef __cplusplus" >out_file - print "}" >out_file - print "#endif" >out_file return } diff --git a/vidix/vidix.h b/vidix/vidix.h index 91f1993185..01a998b004 100644 --- a/vidix/vidix.h +++ b/vidix/vidix.h @@ -36,10 +36,6 @@ #ifndef MPLAYER_VIDIX_H #define MPLAYER_VIDIX_H -#ifdef __cplusplus -extern "C" { -#endif - #define PROBE_NORMAL 0 /* normal probing */ #define PROBE_FORCE 1 /* ignore device_id but recognize device if it's known */ @@ -309,8 +305,4 @@ typedef struct vidix_oem_fx_s char *name[80]; /* effect name to display */ } vidix_oem_fx_t; -#ifdef __cplusplus -} -#endif - #endif /* MPLAYER_VIDIX_H */ diff --git a/vidix/vidixlib.h b/vidix/vidixlib.h index 664579de23..08ca9639da 100644 --- a/vidix/vidixlib.h +++ b/vidix/vidixlib.h @@ -36,10 +36,6 @@ #ifndef MPLAYER_VIDIXLIB_H #define MPLAYER_VIDIXLIB_H -#ifdef __cplusplus -extern "C" { -#endif - #include "vidix.h" typedef struct VDXDriver { @@ -135,8 +131,4 @@ int vdlSetOemEffect(VDL_HANDLE, const vidix_oem_fx_t * ); /* Returns 0 if ok else errno */ int vdlPlaybackCopyFrame(VDL_HANDLE, const vidix_dma_t * ); -#ifdef __cplusplus -} -#endif - #endif /* MPLAYER_VIDIXLIB_H */ |