Commit 32c4eecabf30ae8c02bac283dab857c45e849a7a
1 parent
bd795815
Exists in
master
and in
2 other branches
Fixing customized windows package build.
Showing
2 changed files
with
9 additions
and
2 deletions
Show diff stats
src/core/connect.c
| ... | ... | @@ -166,11 +166,14 @@ |
| 166 | 166 | |
| 167 | 167 | non_blocking(hSession,False); |
| 168 | 168 | |
| 169 | + #pragma GCC diagnostic push | |
| 170 | + #pragma GCC diagnostic ignored "-Wcast-function-type" | |
| 169 | 171 | int rc = lib3270_run_task( |
| 170 | 172 | hSession, |
| 171 | 173 | (int(*)(H3270 *h, void *)) hSession->network.module->start_tls, |
| 172 | 174 | NULL |
| 173 | 175 | ); |
| 176 | + #pragma GCC diagnostic pop | |
| 174 | 177 | |
| 175 | 178 | if(rc == ENOTSUP) { |
| 176 | 179 | ... | ... |
src/include/internals.h
| ... | ... | @@ -42,12 +42,16 @@ |
| 42 | 42 | #include <networking.h> |
| 43 | 43 | #include <lib3270/os.h> |
| 44 | 44 | |
| 45 | +#if defined(HAVE_LDAP) && defined (HAVE_LIBSSL) | |
| 46 | + #include <openssl/x509.h> | |
| 47 | +#endif // !HAVE_LDAP && HAVE_LIBSSL | |
| 48 | + | |
| 45 | 49 | #if defined(X3270_TN3270E) && !defined(X3270_ANSI) /*[*/ |
| 46 | - #define X3270_ANSI 1 /* RFC2355 requires NVT mode */ | |
| 50 | + #define X3270_ANSI 1 // RFC2355 requires NVT mode | |
| 47 | 51 | #endif /*]*/ |
| 48 | 52 | |
| 49 | 53 | #if defined(HAVE_VASPRINTF) && !defined(_GNU_SOURCE) /*[*/ |
| 50 | - #define _GNU_SOURCE /* vasprintf isn't POSIX */ | |
| 54 | + #define _GNU_SOURCE // vasprintf isn't POSIX | |
| 51 | 55 | #endif /*]*/ |
| 52 | 56 | |
| 53 | 57 | // gettext stuff | ... | ... |