wok-6.x annotate mupen64plus/stuff/const.patch @ rev 9493
Up: glib to 2.28.5.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Tue Apr 05 20:07:47 2011 +0000 (2011-04-05) |
| parents | |
| children |
| rev | line source |
|---|---|
| slaxemulator@6800 | 1 diff -aur Mupen64Plus-1-5-src/glide64/Combine.cpp Mupen64Plus-1-5-src_patched/glide64/Combine.cpp |
| slaxemulator@6800 | 2 --- Mupen64Plus-1-5-src/glide64/Combine.cpp 2009-01-04 19:47:08.000000000 +0100 |
| slaxemulator@6800 | 3 +++ Mupen64Plus-1-5-src_patched/glide64/Combine.cpp 2010-02-09 13:18:34.000000000 +0100 |
| slaxemulator@6800 | 4 @@ -11873,7 +11873,7 @@ |
| slaxemulator@6800 | 5 LOG ("InitCombine() "); |
| slaxemulator@6800 | 6 memset(&cmb, 0, sizeof(cmb)); |
| slaxemulator@6800 | 7 const char *extensions = grGetString (GR_EXTENSION); |
| slaxemulator@6800 | 8 - if (char * extstr = strstr(extensions, "COMBINE")) { |
| slaxemulator@6800 | 9 + if (const char * extstr = strstr(extensions, "COMBINE")) { |
| slaxemulator@6800 | 10 if (!strncmp(extstr, "COMBINE", 7)) { |
| slaxemulator@6800 | 11 LOG ("extensions "); |
| slaxemulator@6800 | 12 cmb.grColorCombineExt = (GRCOLORCOMBINEEXT) grGetProcAddress("grColorCombineExt"); |
| slaxemulator@6800 | 13 diff -aur Mupen64Plus-1-5-src/glide64/Main.cpp Mupen64Plus-1-5-src_patched/glide64/Main.cpp |
| slaxemulator@6800 | 14 --- Mupen64Plus-1-5-src/glide64/Main.cpp 2009-01-04 19:47:08.000000000 +0100 |
| slaxemulator@6800 | 15 +++ Mupen64Plus-1-5-src_patched/glide64/Main.cpp 2010-02-09 13:17:39.000000000 +0100 |
| slaxemulator@6800 | 16 @@ -784,7 +784,7 @@ |
| slaxemulator@6800 | 17 printf("bebefore2\n"); |
| slaxemulator@6800 | 18 if (settings.fb_hires) |
| slaxemulator@6800 | 19 { |
| slaxemulator@6800 | 20 - if (char * extstr = strstr(extensions, "TEXTUREBUFFER")) |
| slaxemulator@6800 | 21 + if (const char * extstr = strstr(extensions, "TEXTUREBUFFER")) |
| slaxemulator@6800 | 22 { |
| slaxemulator@6800 | 23 if (!strncmp(extstr, "TEXTUREBUFFER", 13)) |
| slaxemulator@6800 | 24 { |