X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tools%2Fapi_conv.pl;h=83fd82df8545874dc2f8b0b3e1eb6c447dd5ea2c;hb=7b786bd8f34e67617beda4f952a5a636a370396a;hp=2b0fa9f39682484e8d7d041649b290a3955fdaa9;hpb=ca72e777740f917753f3c180fdfdb55df91c09c4;p=free-sw%2Fxcb%2Flibxcb

diff --git a/tools/api_conv.pl b/tools/api_conv.pl
index 2b0fa9f..83fd82d 100755
--- a/tools/api_conv.pl
+++ b/tools/api_conv.pl
@@ -62,7 +62,7 @@ sub convert($$)
 	return "uint$1_t" if /^CARD(8|16|32)$/;
 	return "int$1_t" if /^INT(8|16|32)$/;
 	return "uint8_t" if $_ eq 'BOOL' or $_ eq 'BYTE';
-	return $_ if /^[A-Z]*_[A-Z_]*$/ or !/^XCB(.+)/;
+	return $_ if /^[A-Z0-9]*_[A-Z0-9_]*$/ or !/^XCB(.+)/;
 	my $const = defined $::const{$_};
 	$_ = $1;
 
@@ -93,4 +93,6 @@ sub convert($$)
 	return "xcb" . $_;
 }
 
+s/^(\s*#\s*include\s*<)X11\/XCB\//$1xcb\//;
 s/([_A-Za-z][_A-Za-z0-9]*)([ \t]*\()?/convert($1, defined $2) . ($2 or "")/eg;
+s/xcb_[a-z0-9_]*_new/xcb_generate_id/g;