Mercurial > sdl-ios-xcode
annotate src/main/dummy/SDL_dummy_main.c @ 2320:166400aa33d7
Deleted a call to X__PumpEvents at the end of X11_GL_InitExtensions(). This function is being called from SDL_RecreateWindow at a point when the numwindows value in
is incorrect. The result is that an illegal access is being made in X_PumpEvents when it tries to look up the windows ID of the source of an event. Taking out that
call does not seem to have any effect on the testgl. But, I would be happy if someone else took a look at this problem and found a fix higher up the stack.
author | Bob Pendleton <bob@pendleton.com> |
---|---|
date | Sat, 01 Mar 2008 20:34:36 +0000 |
parents | 44b6f09a07d8 |
children | 791b3256fb22 |
rev | line source |
---|---|
754
623b453a3219
Fixed "dist" make target for newer versions of automake
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
1 |
623b453a3219
Fixed "dist" make target for newer versions of automake
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
2 /* Include the SDL main definition header */ |
623b453a3219
Fixed "dist" make target for newer versions of automake
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
3 #include "SDL_main.h" |
846
96ba4eab74fb
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
754
diff
changeset
|
4 |
754
623b453a3219
Fixed "dist" make target for newer versions of automake
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
5 #ifdef main |
623b453a3219
Fixed "dist" make target for newer versions of automake
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
6 #undef main |
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1753
diff
changeset
|
7 int |
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1753
diff
changeset
|
8 main(int argc, char *argv[]) |
754
623b453a3219
Fixed "dist" make target for newer versions of automake
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
9 { |
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1753
diff
changeset
|
10 return (SDL_main(argc, argv)); |
754
623b453a3219
Fixed "dist" make target for newer versions of automake
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
11 } |
846
96ba4eab74fb
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
754
diff
changeset
|
12 #else |
1753
5b3bb08e7dd8
SDL_dummy_main.c:12: warning: ISO C does not allow extra â;â outside of a function
Sam Lantinga <slouken@libsdl.org>
parents:
846
diff
changeset
|
13 /* Nothing to do on this platform */ |
1949
44b6f09a07d8
Placate versions of ranlib which complain about empty files (Mac OS X 10.4)
Sam Lantinga <slouken@libsdl.org>
parents:
1895
diff
changeset
|
14 int |
44b6f09a07d8
Placate versions of ranlib which complain about empty files (Mac OS X 10.4)
Sam Lantinga <slouken@libsdl.org>
parents:
1895
diff
changeset
|
15 SDL_main_stub_symbol() |
44b6f09a07d8
Placate versions of ranlib which complain about empty files (Mac OS X 10.4)
Sam Lantinga <slouken@libsdl.org>
parents:
1895
diff
changeset
|
16 { |
44b6f09a07d8
Placate versions of ranlib which complain about empty files (Mac OS X 10.4)
Sam Lantinga <slouken@libsdl.org>
parents:
1895
diff
changeset
|
17 return 0; |
44b6f09a07d8
Placate versions of ranlib which complain about empty files (Mac OS X 10.4)
Sam Lantinga <slouken@libsdl.org>
parents:
1895
diff
changeset
|
18 } |
846
96ba4eab74fb
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
754
diff
changeset
|
19 #endif |
1949
44b6f09a07d8
Placate versions of ranlib which complain about empty files (Mac OS X 10.4)
Sam Lantinga <slouken@libsdl.org>
parents:
1895
diff
changeset
|
20 |
1895
c121d94672cb
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents:
1753
diff
changeset
|
21 /* vi: set ts=4 sw=4 expandtab: */ |