diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
commit | af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (patch) | |
tree | 2ead158ae6e6abfffcccf1609aa5492f9402e24f /vidix/pci_db2c.awk | |
parent | d5c868325cefcd5fad53361d1dfdc9757674eb70 (diff) | |
parent | 4653f5ed7575d6070b54a88b4deb449f838825b3 (diff) | |
download | mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.bz2 mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.xz |
Merge svn changes up to r27025
Conflicts:
command.c
libvo/vosub_vidix.c
libvo/vosub_vidix.h
mplayer.c
Diffstat (limited to 'vidix/pci_db2c.awk')
-rw-r--r-- | vidix/pci_db2c.awk | 6 |
1 files changed, 0 insertions, 6 deletions
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 } |