Fix compilation errors and warnings for another gcc 4.7 snapshot.

1 files changed, 22 insertions, 22 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 9bffcfa2a..5025d6d29 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -93,28 +93,28 @@ static void parseOptions(int argc, char *argv[], Client::Options &options)
 
     const struct option long_options[] =
     {
-        { "config-dir",     required_argument, 0, 'C' },
-        { "data",           required_argument, 0, 'd' },
-        { "default",        no_argument,       0, 'D' },
-        { "password",       required_argument, 0, 'P' },
-        { "character",      required_argument, 0, 'c' },
-        { "help",           no_argument,       0, 'h' },
-        { "localdata-dir",  required_argument, 0, 'L' },
-        { "update-host",    required_argument, 0, 'H' },
-        { "port",           required_argument, 0, 'p' },
-        { "server",         required_argument, 0, 's' },
-        { "skip-update",    no_argument,       0, 'u' },
-        { "username",       required_argument, 0, 'U' },
-        { "no-opengl",      no_argument,       0, 'O' },
-        { "chat-log-dir",   required_argument, 0, 'l' },
-        { "version",        no_argument,       0, 'v' },
-        { "log-file",       required_argument, 0, 'l' },
-        { "chat-log-dir",   required_argument, 0, 'L' },
-        { "screenshot-dir", required_argument, 0, 'i' },
-        { "safemode",       no_argument,       0, 'm' },
-        { "tests",          no_argument,       0, 'T' },
-        { "test",           required_argument, 0, 't' },
-        { nullptr,          0,                 0, 0 }
+        { "config-dir",     required_argument, nullptr, 'C' },
+        { "data",           required_argument, nullptr, 'd' },
+        { "default",        no_argument,       nullptr, 'D' },
+        { "password",       required_argument, nullptr, 'P' },
+        { "character",      required_argument, nullptr, 'c' },
+        { "help",           no_argument,       nullptr, 'h' },
+        { "localdata-dir",  required_argument, nullptr, 'L' },
+        { "update-host",    required_argument, nullptr, 'H' },
+        { "port",           required_argument, nullptr, 'p' },
+        { "server",         required_argument, nullptr, 's' },
+        { "skip-update",    no_argument,       nullptr, 'u' },
+        { "username",       required_argument, nullptr, 'U' },
+        { "no-opengl",      no_argument,       nullptr, 'O' },
+        { "chat-log-dir",   required_argument, nullptr, 'l' },
+        { "version",        no_argument,       nullptr, 'v' },
+        { "log-file",       required_argument, nullptr, 'l' },
+        { "chat-log-dir",   required_argument, nullptr, 'L' },
+        { "screenshot-dir", required_argument, nullptr, 'i' },
+        { "safemode",       no_argument,       nullptr, 'm' },
+        { "tests",          no_argument,       nullptr, 'T' },
+        { "test",           required_argument, nullptr, 't' },
+        { nullptr,          0,                 nullptr, 0 }
     };
 
     while (optind < argc)