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

diff --git a/tools/api_conv.pl b/tools/api_conv.pl
index 2b0fa9f..5b3c18d 100755
--- a/tools/api_conv.pl
+++ b/tools/api_conv.pl
@@ -59,10 +59,11 @@ sub convert($$)
 	local $_ = shift;
 	my ($fun) = @_;
 
+	return "xcb_generate_id" if /^xcb_[a-z0-9_]+_new$/ or /^XCB[A-Z0-9]+New$/;
 	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 +94,5 @@ 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;