Commit c677702e516a5309a0fefbae89440503f4bf1f14
1 parent
b3acb187
Exists in
master
and in
1 other branch
Fixing MSVC build.
Showing
1 changed file
with
10 additions
and
2 deletions
Show diff stats
client/src/testprogram/testprogram.cc
@@ -38,14 +38,15 @@ | @@ -38,14 +38,15 @@ | ||
38 | 38 | ||
39 | #include <ctime> | 39 | #include <ctime> |
40 | 40 | ||
41 | - #include <getopt.h> | ||
42 | - | ||
43 | #if defined(_MSC_VER) | 41 | #if defined(_MSC_VER) |
44 | #pragma comment(lib,"ipc3270.lib") | 42 | #pragma comment(lib,"ipc3270.lib") |
45 | #else | 43 | #else |
46 | #pragma GCC diagnostic ignored "-Wunused-function" | 44 | #pragma GCC diagnostic ignored "-Wunused-function" |
47 | #pragma GCC diagnostic ignored "-Wunused-parameter" | 45 | #pragma GCC diagnostic ignored "-Wunused-parameter" |
48 | #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant" | 46 | #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant" |
47 | + | ||
48 | + #include <getopt.h> | ||
49 | + | ||
49 | #endif // _MSC_VER | 50 | #endif // _MSC_VER |
50 | 51 | ||
51 | #include <cstdlib> | 52 | #include <cstdlib> |
@@ -233,6 +234,8 @@ | @@ -233,6 +234,8 @@ | ||
233 | const char * session = ":A"; | 234 | const char * session = ":A"; |
234 | const char * url = nullptr; | 235 | const char * url = nullptr; |
235 | 236 | ||
237 | +#if ! defined(_MSC_VER) | ||
238 | + | ||
236 | static struct option options[] = { | 239 | static struct option options[] = { |
237 | { "session", required_argument, 0, 's' }, | 240 | { "session", required_argument, 0, 's' }, |
238 | { "url", required_argument, 0, 'U' }, | 241 | { "url", required_argument, 0, 'U' }, |
@@ -269,6 +272,11 @@ | @@ -269,6 +272,11 @@ | ||
269 | 272 | ||
270 | } | 273 | } |
271 | 274 | ||
275 | +#else | ||
276 | + | ||
277 | + | ||
278 | +#endif // !_MSC_VER | ||
279 | + | ||
272 | /* | 280 | /* |
273 | 281 | ||
274 | host.setTimeout(10); | 282 | host.setTimeout(10); |