wine/tools/winapi winapi_parser.pm

[Alexandre Julliard]

ChangeSet ID:	21111
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard(a)winehq.org	2005/11/04 05:39:58

Modified files:
	tools/winapi   : winapi_parser.pm 

Log message:
	Vincent Béron <vberon(a)mecano.gme.usherb.ca>
	volatile is legal (and used now!) in a typedef struct {}.

Patch: http://cvs.winehq.org/patch.py?id=21111

Old revision  New revision  Changes     Path
 1.6           1.7           +2 -1       wine/tools/winapi/winapi_parser.pm

Index: wine/tools/winapi/winapi_parser.pm
diff -u -p wine/tools/winapi/winapi_parser.pm:1.6 wine/tools/winapi/winapi_parser.pm:1.7
--- wine/tools/winapi/winapi_parser.pm:1.6	4 Nov 2005 11:39:58 -0000
+++ wine/tools/winapi/winapi_parser.pm	4 Nov 2005 11:39:58 -0000
@@ -359,8 +359,9 @@ sub parse_c_file($$) {
 		    $statements = undef;
 		} elsif($in_type) {
 		    if(/^\s*((?:(?:FAR\s*)?\*\s*(?:RESTRICTED_POINTER\s+)?)?
+			    (?:volatile\s+)?
 			    (?:\w+|WS\(\w+\))\s*
-			    (?:\s*,\s*(?:(?:FAR\s*)?\*+\s*(?:RESTRICTED_POINTER\s+)?)?(?:\w+|WS\(\w+\)))*\s*);/sx) {
+			    (?:\s*,\s*(?:(?:FAR\s*)?\*+\s*(?:RESTRICTED_POINTER\s+)?)?(?:volatile\s+)?(?:\w+|WS\(\w+\)))*\s*);/sx) {
 			my @parts = split(/\s*,\s*/, $1);
 			&$type_end([@parts]);
 		    } elsif(/;/s) {