diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-06-15 18:03:07 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-06-15 18:03:07 +0100 |
| commit | 7aa3e9b1ee707841c4d6f9a9d4d9fdaa8d163b40 (patch) | |
| tree | 81edf602666e39a243e700cc54d2bf12b2173d59 | |
| parent | a4919da0a43f156741fdc20b9424b96b83216412 (diff) | |
| parent | b4baa1fba20518e5a22919d70ed32cb25785dc54 (diff) | |
Merge branch 'cygwin-patches-for-1.12' into cygwin-release-1.12xserver-cygwin-1.12.1-2
Conflicts:
os/backtrace.c
| -rwxr-xr-x | hw/xwin/glx/gen_gl_wrappers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xwin/glx/gen_gl_wrappers.py b/hw/xwin/glx/gen_gl_wrappers.py index 79fbeefe8..0ff579ac0 100755 --- a/hw/xwin/glx/gen_gl_wrappers.py +++ b/hw/xwin/glx/gen_gl_wrappers.py @@ -67,7 +67,7 @@ if dispatchheader : fh = open(dispatchheader) dispatchh = fh.readlines() - dispatch_regex = re.compile(r'(?:#define|static\sinline\svoid)\sSET_(\S*)\(') + dispatch_regex = re.compile(r'(?:#define\s|static\sinline\svoid\s|)SET_(\S*)\(') for line in dispatchh : line = line.strip() |