apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r892141 - in /apr/apr/trunk/include: apr.hnw arch/netware/apr_private.h
Date Fri, 18 Dec 2009 05:20:43 GMT
Author: wrowe
Date: Fri Dec 18 05:20:42 2009
New Revision: 892141

URL: http://svn.apache.org/viewvc?rev=892141&view=rev
Log:
Netware changes; always include netware.h/library.h for
whatever local functions or types would be aliased, in
a public manner, and drop very stale references to flavors
which should not be in common use.

It's not necessary to exclude by platform, is it?

Modified:
    apr/apr/trunk/include/apr.hnw
    apr/apr/trunk/include/arch/netware/apr_private.h

Modified: apr/apr/trunk/include/apr.hnw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.hnw?rev=892141&r1=892140&r2=892141&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.hnw (original)
+++ apr/apr/trunk/include/apr.hnw Fri Dec 18 05:20:42 2009
@@ -48,6 +48,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
+#include <netware.h>
+#include <library.h>
 #include <nks/thread.h>
 #include <nks/synch.h>
 #include <nks/time.h>

Modified: apr/apr/trunk/include/arch/netware/apr_private.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/arch/netware/apr_private.h?rev=892141&r1=892140&r2=892141&view=diff
==============================================================================
--- apr/apr/trunk/include/arch/netware/apr_private.h (original)
+++ apr/apr/trunk/include/arch/netware/apr_private.h Fri Dec 18 05:20:42 2009
@@ -16,28 +16,13 @@
 
 /*
  * Note: 
- * This is the windows specific autoconf-like config file
- * which unix would create at build time.
+ * This is the netware-specific autoconf-like config file
+ * which unix creates at ./configure time.
  */
 
-#ifdef NETWARE
-
 #ifndef APR_PRIVATE_H
 #define APR_PRIVATE_H
 
-/* Include the public APR symbols, include our idea of the 'right'
- * subset of the Windows.h header.  This saves us repetition.
- */
-#include "apr.h"
-
-#include <sys/types.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <library.h>
-#include <netware.h>
-
 /* Use this section to define all of the HAVE_FOO_H
  * that are required to build properly.
  */
@@ -71,19 +56,10 @@
 #define HAVE_WRITEV     1
 
 #define HAVE_GETPASS_R  1
-/*
- * check for older NDKs which have only the getpassword() function.
- */
-#include <ndkvers.h>
-#if (CURRENT_NDK_THRESHOLD < 709060000)
-#define getpass_r getpassword
-#endif
 
 /* 64-bit integer conversion function */
 #define APR_INT64_STRFN	      strtoll
 
-/*#define DSO_USE_DLFCN */
-
 #ifdef NW_BUILD_IPV6
 #define HAVE_GETADDRINFO 1
 #define HAVE_GETNAMEINFO 1
@@ -194,4 +170,3 @@
 #define APR_DWORD_MAX 0xFFFFFFFFUL
 
 #endif  /*APR_PRIVATE_H*/
-#endif  /*NETWARE*/



Mime
View raw message