Download as
Browse Code »

Commit 2427e28358c1dfbe837b5b6430bb664a6e746d81

Authored by perry.werneck@gmail.com
1 parent 9921a408
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Correcoes para compilacao no mingw64

Showing 5 changed files with 11 additions and 6 deletions   Show diff stats
src/lib3270/XtGlue.c
  Diff comments   View file @2427e28
... ... @@ -55,8 +55,8 @@
55 55  
56 56 #if defined(_WIN32) /*[*/
57 57  
58   - #include <windows.h>
59 58 #include <winsock2.h>
  59 + #include <windows.h>
60 60 #include <ws2tcpip.h>
61 61  
62 62 #else /*][*/
... ...
src/lib3270/telnet.c
  Diff comments   View file @2427e28
... ... @@ -656,9 +656,9 @@ int net_connect(H3270 *session, const char *host, char *portname, Boolean ls, Bo
656 656 case SE_EINPROGRESS:
657 657 *pending = True;
658 658 trace_dsn("Connection pending.\n");
659   -// #if !defined(_WIN32)
  659 +#if !defined(_WIN32)
660 660 output_id = AddOutput(session->sock, session, output_possible);
661   -// #endif
  661 +#endif
662 662 break;
663 663  
664 664 default:
... ...
src/lib3270/util.c
  Diff comments   View file @2427e28
... ... @@ -76,7 +76,7 @@ int get_version_info(void)
76 76 info.dwOSVersionInfoSize = sizeof(info);
77 77 if(GetVersionEx(&info) == 0)
78 78 {
79   - lib3270_write_log("lib3270","%s","Can't get Windows version");
  79 + lib3270_write_log(NULL,"lib3270","%s","Can't get Windows version");
80 80 return -1;
81 81 }
82 82  
... ...
src/pw3270/common/config.c
  Diff comments   View file @2427e28
... ... @@ -489,7 +489,7 @@ void set_integer_to_config(const gchar *group, const gchar *key, gint val)
489 489  
490 490 if(rc != ERROR_SUCCESS)
491 491 {
492   - gchar *msg = get_last_error_msg();
  492 + gchar *msg = g_win32_error_message(GetLastError());
493 493 g_warning("Error \"%s\" when setting key HKCU\\%s\\%s",msg,path,key);
494 494 g_free(msg);
495 495 }
... ... @@ -497,7 +497,7 @@ void set_integer_to_config(const gchar *group, const gchar *key, gint val)
497 497 }
498 498 else
499 499 {
500   - gchar *msg = get_last_error_msg();
  500 + gchar *msg = g_win32_error_message(GetLastError());
501 501 g_warning("Error \"%s\" when creating key HKCU\\%s",msg,path);
502 502 g_free(msg);
503 503 }
... ...
src/pw3270/v3270/accessible.c
  Diff comments   View file @2427e28
... ... @@ -727,8 +727,13 @@ static void v3270_accessible_get_size(AtkComponent *component,gint *width, gint
727 727 if (widget == NULL)
728 728 return;
729 729  
  730 +#if GTK_CHECK_VERSION(3,0,0)
730 731 *width = gtk_widget_get_allocated_width (widget);
731 732 *height = gtk_widget_get_allocated_height (widget);
  733 +#else
  734 + *width = widget->allocation.width;
  735 + *height = widget->allocation.height;
  736 +#endif // GTK(3,0,0)
732 737 }
733 738  
734 739 static gboolean v3270_accessible_grab_focus(AtkComponent *component)
... ...