Download as
Browse Code »

Commit bed3d3d6e2a4e05d0afde076b160e85d7ecd6317

Authored by Perry Werneck
1 parent efe40a72
Exists in master and in 1 other branch develop

Fixing mingw build.

Showing 3 changed files with 19 additions and 8 deletions   Show diff stats
src/core/get.cc
  Diff comments   View file @bed3d3d
... ... @@ -27,7 +27,13 @@
27 27 *
28 28 */
29 29  
30   - #include "private.h"
  30 +#include <algorithm>
  31 +
  32 +#if ! defined(_MSC_VER)
  33 + using std::min;
  34 +#endif
  35 +
  36 +#include "private.h"
31 37  
32 38 /*--[ Implement ]------------------------------------------------------------------------------------*/
33 39  
... ...
src/core/hllapi.cc
  Diff comments   View file @bed3d3d
... ... @@ -27,15 +27,20 @@
27 27 *
28 28 */
29 29  
  30 +#include <algorithm>
  31 +
30 32 #if defined(_MSC_VER)
31 33 #define strncasecmp _strnicmp
32 34 #define strcasecmp _stricmp
33   - #endif
  35 +#else
  36 + using std::min;
  37 +#endif
  38 +
  39 +#include "private.h"
  40 +#include <lib3270/hllapi.h>
34 41  
35   - #include "private.h"
36   - #include <lib3270/hllapi.h>
37 42  
38   - /*--[ Prototipes ]-----------------------------------------------------------------------------------*/
  43 +/*--[ Prototipes ]-----------------------------------------------------------------------------------*/
39 44  
40 45 static int connect_ps(char *buffer, unsigned short *length, unsigned short *rc);
41 46 static int disconnect_ps(char *buffer, unsigned short *length, unsigned short *rc);
... ...
src/core/windows/init.cc
  Diff comments   View file @bed3d3d
... ... @@ -56,7 +56,7 @@
56 56 #include <stdexcept>
57 57 #include <lib3270.h>
58 58 #include <lib3270/hllapi.h>
59   -
  59 +
60 60 #ifdef HAVE_LIBINTL
61 61 #include <libintl.h>
62 62 #endif // HAVE_LIBINTL
... ... @@ -75,7 +75,7 @@
75 75 extern HRESULT DllInstall(BOOL, PCWSTR);
76 76 extern HRESULT DllUnregisterServer();
77 77  
78   - #else
  78 + #else
79 79  
80 80 extern __declspec (dllexport) HRESULT DllRegisterServer();
81 81 extern __declspec (dllexport) HRESULT DllInstall(BOOL, PCWSTR);
... ... @@ -153,7 +153,7 @@
153 153 message
154 154 };
155 155  
156   - debug("Event: \"%s\"",msg);
  156 + debug("Event: \"%s\"",message);
157 157  
158 158 ReportEvent(
159 159 hEventLog,
... ...