From 87aafe2c1f8ca24906acb556c188c703657e4e53 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Mon, 20 May 2019 10:02:37 -0300 Subject: [PATCH] Fixing windows build. --- src/lib3270/init.c | 2 +- src/lib3270/printer.c | 10 +++++----- src/lib3270/properties.c | 2 +- src/lib3270/ssl/windows/getcrl.c | 2 +- src/lib3270/toggles.c | 19 ------------------- src/lib3270/windows/connect.c | 3 +-- src/lib3270/windows/util.c | 2 +- 7 files changed, 10 insertions(+), 30 deletions(-) diff --git a/src/lib3270/init.c b/src/lib3270/init.c index 6b1b66d..0b61d9f 100644 --- a/src/lib3270/init.c +++ b/src/lib3270/init.c @@ -119,7 +119,7 @@ int lib3270_unloaded(void) #if defined WIN32 -BOOL WINAPI DllMain(HANDLE hinst unused, DWORD dwcallpurpose, LPVOID lpvResvd unused) +BOOL WINAPI DllMain(HANDLE GNUC_UNUSED(hinst), DWORD dwcallpurpose, LPVOID GNUC_UNUSED(lpvResvd)) { // Trace("%s - Library %s",__FUNCTION__,(dwcallpurpose == DLL_PROCESS_ATTACH) ? "Loaded" : "Unloaded"); diff --git a/src/lib3270/printer.c b/src/lib3270/printer.c index f031864..dbe5df3 100644 --- a/src/lib3270/printer.c +++ b/src/lib3270/printer.c @@ -106,8 +106,8 @@ static void printer_otimeout(H3270 *session); static void printer_etimeout(H3270 *session); static void printer_dump(struct pr3o *p, Boolean is_err, Boolean is_dead); #endif /*]*/ -static void printer_host_connect(H3270 *session, int connected unused, void *dunno); -static void printer_exiting(H3270 *session, int b unused, void *dunno); +static void printer_host_connect(H3270 *session, int connected, void *dunno); +static void printer_exiting(H3270 *session, int b, void *dunno); /* Globals */ @@ -660,7 +660,7 @@ printer_stop(void) /* The emulator is exiting. Make sure the printer session is cleaned up. */ static void -printer_exiting(H3270 *session, int b unused, void *dunno) +printer_exiting(H3270 *session, int GNUC_UNUSED(b), void *dunno) { printer_stop(); } @@ -668,7 +668,7 @@ printer_exiting(H3270 *session, int b unused, void *dunno) #if defined(X3270_DISPLAY) /*[*/ /* Callback for "OK" button on printer specific-LU popup */ static void -lu_callback(Widget w, XtPointer client_data, XtPointer call_data unused) +lu_callback(Widget w, XtPointer client_data, XtPointer G_GNUC_UNUSED(call_data)) { char *lu; @@ -687,7 +687,7 @@ lu_callback(Widget w, XtPointer client_data, XtPointer call_data unused) /* Host connect/disconnect/3270-mode event. */ static void -printer_host_connect(H3270 *session, int connected unused, void *dunno) +printer_host_connect(H3270 *session, int GNUC_UNUSED(connected), void *dunno) { if (IN_3270) { char *printer_lu = appres.printer_lu; diff --git a/src/lib3270/properties.c b/src/lib3270/properties.c index 68edf3c..24791f4 100644 --- a/src/lib3270/properties.c +++ b/src/lib3270/properties.c @@ -653,7 +653,7 @@ LIB3270_EXPORT char * lib3270_get_ssl_crl_text(H3270 *hSession) } #else -LIB3270_EXPORT char * lib3270_get_ssl_crl_text(H3270 *hSession unused) +LIB3270_EXPORT char * lib3270_get_ssl_crl_text(H3270 GNUC_UNUSED(*hSession)) { return NULL; } diff --git a/src/lib3270/ssl/windows/getcrl.c b/src/lib3270/ssl/windows/getcrl.c index e614a4f..572e980 100644 --- a/src/lib3270/ssl/windows/getcrl.c +++ b/src/lib3270/ssl/windows/getcrl.c @@ -131,7 +131,7 @@ static size_t internal_curl_write_callback(void *contents, size_t size, size_t n return realsize; } -static int internal_curl_trace_callback(CURL *handle unused, curl_infotype type, char *data, size_t size, void *userp) +static int internal_curl_trace_callback(CURL GNUC_UNUSED(*handle), curl_infotype type, char *data, size_t size, void *userp) { const char * text = NULL; diff --git a/src/lib3270/toggles.c b/src/lib3270/toggles.c index 67e9401..087ef58 100644 --- a/src/lib3270/toggles.c +++ b/src/lib3270/toggles.c @@ -340,25 +340,6 @@ static void toggle_keepalive(H3270 *session, struct lib3270_toggle GNUC_UNUSED(* } } -/* -static void toggle_reconnect(H3270 *hSession, struct lib3270_toggle *t unused, LIB3270_TOGGLE_TYPE type ) -{ - - // If already connected or not interactive returns. - if(hSession->sock > 0 || type != TT_INTERACTIVE) - return; - - if(t->value && !hSession->auto_reconnect_inprogress) - { - // Schedule an automatic reconnection. - lib3270_write_log(hSession,"toggle","Auto-reconnect toggle was activated when offline, reconnecting"); - hSession->auto_reconnect_inprogress = 1; - (void) AddTimer(RECONNECT_MS, hSession, lib3270_check_for_auto_reconnect); - } - -} -*/ - /** * @brief Called from system initialization code to handle initial toggle settings. */ diff --git a/src/lib3270/windows/connect.c b/src/lib3270/windows/connect.c index 2af06ad..80ca239 100644 --- a/src/lib3270/windows/connect.c +++ b/src/lib3270/windows/connect.c @@ -59,8 +59,7 @@ /*---[ Implement ]-------------------------------------------------------------------------------*/ -//static void net_connected(H3270 *hSession) -static void net_connected(H3270 *hSession, int fd unused, LIB3270_IO_FLAG flag unused, void *dunno unused) +static void net_connected(H3270 *hSession, int GNUC_UNUSED(fd), LIB3270_IO_FLAG GNUC_UNUSED(flag), void GNUC_UNUSED(*dunno)) { int err; socklen_t len = sizeof(err); diff --git a/src/lib3270/windows/util.c b/src/lib3270/windows/util.c index dbd3f3e..4d97532 100644 --- a/src/lib3270/windows/util.c +++ b/src/lib3270/windows/util.c @@ -194,7 +194,7 @@ LIB3270_EXPORT const char * lib3270_win32_local_charset(void) #define SECS_BETWEEN_EPOCHS 11644473600ULL #define SECS_TO_100NS 10000000ULL /* 10^7 */ -int gettimeofday(struct timeval *tv, void *ignored unused) +int gettimeofday(struct timeval *tv, void GNUC_UNUSED(*ignored)) { FILETIME t; ULARGE_INTEGER u; -- libgit2 0.21.2