Download as
Browse Code »

Commit c099129b41c202a7aca09100c3063478ad43507f

Authored by Perry Werneck
2 parents 21ba1167 60933587
Exists in v5.2

Merge remote-tracking branch 'refs/remotes/origin/master'

Showing 2 changed files with 15 additions and 3 deletions   Show diff stats
src/libpw3270cpp/exception.cc
  Diff comments   View file @c099129
@@ -27,6 +27,14 @@ @@ -27,6 +27,14 @@
27 * 27 *
28 */ 28 */
29 29
  30 + #include <config.h>
  31 +
  32 + #ifdef WIN32
  33 + #include <windows.h>
  34 + #else
  35 + #include <unistd.h>
  36 + #endif // WIN32
  37 +
30 #include <stdarg.h> 38 #include <stdarg.h>
31 #include <stdio.h> 39 #include <stdio.h>
32 #include <string.h> 40 #include <string.h>
src/libpw3270cpp/session.cc
  Diff comments   View file @c099129
@@ -28,6 +28,13 @@ @@ -28,6 +28,13 @@
28 */ 28 */
29 29
30 #include <config.h> 30 #include <config.h>
  31 +
  32 + #ifdef WIN32
  33 + #include <windows.h>
  34 + #else
  35 + #include <unistd.h>
  36 + #endif // WIN32
  37 +
31 #include <stdarg.h> 38 #include <stdarg.h>
32 #include <stdio.h> 39 #include <stdio.h>
33 #include <string.h> 40 #include <string.h>
@@ -35,9 +42,6 @@ @@ -35,9 +42,6 @@
35 42
36 #include "private.h" 43 #include "private.h"
37 44
38 -#ifndef WIN32  
39 - #include <unistd.h>  
40 -#endif // !WIN32  
41 45
42 #ifdef HAVE_SYSLOG 46 #ifdef HAVE_SYSLOG
43 #include <syslog.h> 47 #include <syslog.h>