wrowe 01/04/12 06:51:45
Modified: include/arch/win32 apr_private.h
include apr.hw
Log:
Include windows headers in apr.h (.hw) and include apr.h within
apr_private.h for consistency. Also provide exceptions for many
common errors when compiling /W4.
Revision Changes Path
1.22 +5 -31 apr/include/arch/win32/apr_private.h
Index: apr_private.h
===================================================================
RCS file: /home/cvs/apr/include/arch/win32/apr_private.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- apr_private.h 2001/02/25 20:39:33 1.21
+++ apr_private.h 2001/04/12 13:51:42 1.22
@@ -63,45 +63,19 @@
#ifndef APR_PRIVATE_H
#define APR_PRIVATE_H
-/* Has windows.h already been included? If so, our preferences don't matter,
- * but we will still need the winsock things no matter what was included.
- * If not, include a restricted set of windows headers to our tastes.
+/* Include the public APR symbols, include our idea of the 'right'
+ * subset of the Windows.h header. This saves us repetition.
*/
-#ifndef _WINDOWS_
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#ifndef _WIN32_WINNT
+#include "apr.h"
-/* Restrict the server to a subset of Windows NT 4.0 header files by default
- */
-#define _WIN32_WINNT 0x0400
-#endif
-#ifndef NOUSER
-#define NOUSER
-#endif
-#ifndef NOGDI
-#define NOGDI
-#endif
-#ifndef NONLS
-#define NONLS
-#endif
-#ifndef NOMCX
-#define NOMCX
-#endif
-#ifndef NOIME
-#define NOIME
-#endif
-#include <windows.h>
/*
* Add a _very_few_ declarations missing from the restricted set of headers
* (If this list becomes extensive, re-enable the required headers above!)
* winsock headers were excluded by WIN32_LEAN_AND_MEAN, so include them now
*/
+#ifndef SW_HIDE
#define SW_HIDE 0
-#include <winsock2.h>
-#include <mswsock.h>
-#endif /* !_WINDOWS_ */
+#endif
#include <sys/types.h>
#include <stddef.h>
1.61 +12 -0 apr/include/apr.hw
Index: apr.hw
===================================================================
RCS file: /home/cvs/apr/include/apr.hw,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- apr.hw 2001/04/12 07:05:49 1.60
+++ apr.hw 2001/04/12 13:51:44 1.61
@@ -97,6 +97,7 @@
* winsock headers were excluded by WIN32_LEAN_AND_MEAN, so include them now
*/
#define SW_HIDE 0
+#include <wtypes.h>
#include <winsock2.h>
#include <mswsock.h>
#endif /* !_WINDOWS_ */
@@ -107,6 +108,17 @@
#include <time.h>
#include <process.h>
#include <stdlib.h>
+
+/* disable or reduce the frequency of...
+ * C4057: indirection to slightly different base types
+ * C4075: slight indirection changes (unsigned short* vs short[])
+ * C4100: unreferenced formal parameter
+ * C4127: conditional expression is constant
+ * C4201: nonstandard extension nameless struct/unions
+ * C4244: int to char/short - precision loss
+ *
+ */
+#pragma warning(disable: 4100 4127 4201; once: 4057 4075 4244)
#define APR_INLINE __inline
#define APR_HAS_INLINE 1
