OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________
________________
Server: cvs.openssl.org Name: Andy
Polyakov
Root: /v/openssl/cvs Email: appro openssl.org
Module: openssl Date:
23-Oct-2006 09:41:05
Branch: HEAD Handle:
2006102308410302
Modified files:
openssl e_os.h
openssl/crypto LPdir_win.c
openssl/crypto/dso dso_win32.c
openssl/crypto/engine eng_padlock.c
Log:
Fix mingw warnings.
Summary:
Revision Changes Path
1.9 +0 -2 openssl/crypto/LPdir_win.c
1.35 +1 -1 openssl/crypto/dso/dso_win32.c
1.21 +4 -2
openssl/crypto/engine/eng_padlock.c
1.95 +4 -1 openssl/e_os.h
____________________________________________________________
________________
patch -p0 <<' .'
Index: openssl/crypto/LPdir_win.c
============================================================
================
$ cvs diff -u -r1.8 -r1.9 LPdir_win.c
--- openssl/crypto/LPdir_win.c 23 Sep 2004 22:11:39
-0000 1.8
+++ openssl/crypto/LPdir_win.c 23 Oct 2006 07:41:04
-0000 1.9
-54,8 +54,6
const char *LP_find_file(LP_DIR_CTX **ctx, const char
*directory)
{
- struct dirent *direntry = NULL;
-
if (ctx == NULL || directory == NULL)
{
errno = EINVAL;
.
patch -p0 <<' .'
Index: openssl/crypto/dso/dso_win32.c
============================================================
================
$ cvs diff -u -r1.34 -r1.35 dso_win32.c
--- openssl/crypto/dso/dso_win32.c 15 Jan 2006 17:31:07
-0000 1.34
+++ openssl/crypto/dso/dso_win32.c 23 Oct 2006 07:41:04
-0000 1.35
-826,7 +826,7
}
do {
- if (ret = GetProcAddress(me32.hModule,name))
+ if ((ret = GetProcAddress(me32.hModule,name)))
{
(*close_snap)(hModuleSnap);
FreeLibrary(dll);
.
patch -p0 <<' .'
Index: openssl/crypto/engine/eng_padlock.c
============================================================
================
$ cvs diff -u -r1.20 -r1.21 eng_padlock.c
--- openssl/crypto/engine/eng_padlock.c 19 Oct 2006
20:55:05 -0000 1.20
+++ openssl/crypto/engine/eng_padlock.c 23 Oct 2006
07:41:05 -0000 1.21
-123,9 +123,11
#ifdef COMPILE_HW_PADLOCK
/* We do these includes here to avoid header problems on
platforms that
do not have the VIA padlock anyway... */
-#ifdef _MSC_VER
+#ifdef _WIN32
# include <malloc.h>
-# define alloca _alloca
+# ifndef alloca
+# define alloca _alloca
+# endif
#else
# include <stdlib.h>
#endif
.
patch -p0 <<' .'
Index: openssl/e_os.h
============================================================
================
$ cvs diff -u -r1.94 -r1.95 e_os.h
--- openssl/e_os.h 11 Apr 2006 21:34:13 -0000 1.94
+++ openssl/e_os.h 23 Oct 2006 07:41:03 -0000 1.95
-452,7 +452,10
# if defined(_WIN32_WCE) &&
_WIN32_WCE<410
# define getservbyname
_masked_declaration_getservbyname
# endif
-# include <winsock.h>
+# if !defined(IPPROTO_IP)
+ /* winsock[2].h was included already? */
+# include <winsock.h>
+# endif
# ifdef getservbyname
# undef getservbyname
/* this is used to be
wcecompat/include/winsock_extras.h */
.
____________________________________________________________
__________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List
openssl-cvsopenssl.org
Automated List Manager
majordomoopenssl.org
|