diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-04-17 12:12:46 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2014-04-17 12:12:46 +0200 |
| commit | 2a4aa00b0f579a3be0e8449914e65c9329253611 (patch) | |
| tree | 4eeec415f485774bbe84d7267c6f040333a90ea4 /emulator/opengl/host/tools/emugen/getopt.c | |
| parent | 3630e36f8fe89f59f464807828c55d37424dbcfa (diff) | |
| download | sdk-2a4aa00b0f579a3be0e8449914e65c9329253611.zip sdk-2a4aa00b0f579a3be0e8449914e65c9329253611.tar.gz sdk-2a4aa00b0f579a3be0e8449914e65c9329253611.tar.bz2 | |
emulator/opengl: Backport fixes from master branch.
This back-ports several fixes from aosp/master branch into idea133:
145e25 Fix the Google Maps crash issue
e33909 Support GL_MAX_TEXTURE_SIZE case to glGetIntegerv API
c6dd20 Fix Mac build.
Change-Id: I26a05956c3b926dddeb638c6cff979199075ecbb
Diffstat (limited to 'emulator/opengl/host/tools/emugen/getopt.c')
| -rw-r--r-- | emulator/opengl/host/tools/emugen/getopt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/emulator/opengl/host/tools/emugen/getopt.c b/emulator/opengl/host/tools/emugen/getopt.c index 0ac02d8..3523538 100644 --- a/emulator/opengl/host/tools/emugen/getopt.c +++ b/emulator/opengl/host/tools/emugen/getopt.c @@ -8,7 +8,7 @@ int opterr = 1; int optind = 1; int optopt = 0; -const char* optarg; +char* optarg; int getopt(int argc, char* const argv[], const char* ostr) { static const char kEmpty[] = ""; @@ -57,9 +57,9 @@ int getopt(int argc, char* const argv[], const char* ostr) { // This option needs an argument. Either after the option character, // or the argument that follows. if (*place) { - optarg = place; + optarg = (char *)place; } else if (argc > ++optind) { - optarg = argv[optind]; + optarg = (char *)argv[optind]; } else if (oindex[2] == ':') { // Optional argument is missing. place = kEmpty; |