提交 a6efc2d1 编写于 作者: A Andy Polyakov

Fix mingw warnings.

上级 3189772e
...@@ -54,8 +54,6 @@ struct LP_dir_context_st ...@@ -54,8 +54,6 @@ struct LP_dir_context_st
const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory) const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
{ {
struct dirent *direntry = NULL;
if (ctx == NULL || directory == NULL) if (ctx == NULL || directory == NULL)
{ {
errno = EINVAL; errno = EINVAL;
......
...@@ -826,7 +826,7 @@ static void *win32_globallookup(const char *name) ...@@ -826,7 +826,7 @@ static void *win32_globallookup(const char *name)
} }
do { do {
if (ret = GetProcAddress(me32.hModule,name)) if ((ret = GetProcAddress(me32.hModule,name)))
{ {
(*close_snap)(hModuleSnap); (*close_snap)(hModuleSnap);
FreeLibrary(dll); FreeLibrary(dll);
......
...@@ -123,9 +123,11 @@ void ENGINE_load_padlock (void) ...@@ -123,9 +123,11 @@ void ENGINE_load_padlock (void)
#ifdef COMPILE_HW_PADLOCK #ifdef COMPILE_HW_PADLOCK
/* We do these includes here to avoid header problems on platforms that /* We do these includes here to avoid header problems on platforms that
do not have the VIA padlock anyway... */ do not have the VIA padlock anyway... */
#ifdef _MSC_VER #ifdef _WIN32
# include <malloc.h> # include <malloc.h>
# define alloca _alloca # ifndef alloca
# define alloca _alloca
# endif
#else #else
# include <stdlib.h> # include <stdlib.h>
#endif #endif
......
...@@ -452,7 +452,10 @@ static unsigned int _strlen31(const char *str) ...@@ -452,7 +452,10 @@ static unsigned int _strlen31(const char *str)
# if defined(_WIN32_WCE) && _WIN32_WCE<410 # if defined(_WIN32_WCE) && _WIN32_WCE<410
# define getservbyname _masked_declaration_getservbyname # define getservbyname _masked_declaration_getservbyname
# endif # endif
# include <winsock.h> # if !defined(IPPROTO_IP)
/* winsock[2].h was included already? */
# include <winsock.h>
# endif
# ifdef getservbyname # ifdef getservbyname
# undef getservbyname # undef getservbyname
/* this is used to be wcecompat/include/winsock_extras.h */ /* this is used to be wcecompat/include/winsock_extras.h */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册