# HG changeset patch
# User ben
# Date 1212839253 0
# Node ID caa5f90c7cb066f696faa401b9c4e11bbb3af92b
# Parent  53ae66ee504e61501d89550b18f5aa5f48e274ce
remove C++ inclusion guard from vidix headers

diff -r 53ae66ee504e -r caa5f90c7cb0 vidix/dha.h
--- a/vidix/dha.h	Sat Jun 07 11:45:25 2008 +0000
+++ b/vidix/dha.h	Sat Jun 07 11:47:33 2008 +0000
@@ -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 @@
 #define MTRR_TYPE_WRBACK     6
 extern int	mtrr_set_type(unsigned base,unsigned size,int type);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* MPLAYER_DHA_H */
diff -r 53ae66ee504e -r caa5f90c7cb0 vidix/pci_db2c.awk
--- a/vidix/pci_db2c.awk	Sat Jun 07 11:45:25 2008 +0000
+++ b/vidix/pci_db2c.awk	Sat Jun 07 11:47:33 2008 +0000
@@ -145,9 +145,6 @@
 
 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 @@
    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 -r 53ae66ee504e -r caa5f90c7cb0 vidix/vidix.h
--- a/vidix/vidix.h	Sat Jun 07 11:45:25 2008 +0000
+++ b/vidix/vidix.h	Sat Jun 07 11:47:33 2008 +0000
@@ -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 @@
   char *name[80];	/* effect name to display */
 } vidix_oem_fx_t;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* MPLAYER_VIDIX_H */
diff -r 53ae66ee504e -r caa5f90c7cb0 vidix/vidixlib.h
--- a/vidix/vidixlib.h	Sat Jun 07 11:45:25 2008 +0000
+++ b/vidix/vidixlib.h	Sat Jun 07 11:47:33 2008 +0000
@@ -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 @@
 			/* Returns 0 if ok else errno */
 int	  vdlPlaybackCopyFrame(VDL_HANDLE, const vidix_dma_t * );
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* MPLAYER_VIDIXLIB_H */