[MPlayer-cvslog] r27011 - in trunk/vidix: dha.h pci_db2c.awk vidix.h vidixlib.h

[ben]

Author: ben
Date: Sat Jun  7 13:47:33 2008
New Revision: 27011

Log:
remove C++ inclusion guard from vidix headers

Modified:
   trunk/vidix/dha.h
   trunk/vidix/pci_db2c.awk
   trunk/vidix/vidix.h
   trunk/vidix/vidixlib.h

Modified: trunk/vidix/dha.h
==============================================================================
--- trunk/vidix/dha.h	(original)
+++ trunk/vidix/dha.h	Sat Jun  7 13:47:33 2008
@@ -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,
 #define MTRR_TYPE_WRBACK     6
 extern int	mtrr_set_type(unsigned base,unsigned size,int type);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* MPLAYER_DHA_H */

Modified: trunk/vidix/pci_db2c.awk
==============================================================================
--- trunk/vidix/pci_db2c.awk	(original)
+++ trunk/vidix/pci_db2c.awk	Sat Jun  7 13:47:33 2008
@@ -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
 }
 

Modified: trunk/vidix/vidix.h
==============================================================================
--- trunk/vidix/vidix.h	(original)
+++ trunk/vidix/vidix.h	Sat Jun  7 13:47:33 2008
@@ -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 */

Modified: trunk/vidix/vidixlib.h
==============================================================================
--- trunk/vidix/vidixlib.h	(original)
+++ trunk/vidix/vidixlib.h	Sat Jun  7 13:47:33 2008
@@ -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 
 			/* Returns 0 if ok else errno */
 int	  vdlPlaybackCopyFrame(VDL_HANDLE, const vidix_dma_t * );
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* MPLAYER_VIDIXLIB_H */