apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r661369 - /apr/apr/branches/1.3.x/include/apr.h.in
Date Thu, 29 May 2008 15:47:52 GMT
Author: wrowe
Date: Thu May 29 08:47:52 2008
New Revision: 661369

URL: http://svn.apache.org/viewvc?rev=661369&view=rev
Log:
Respect the cardinal rule that non-apr stuff needs to be
outside of the apr doxygen blocks.

Modified:
    apr/apr/branches/1.3.x/include/apr.h.in

Modified: apr/apr/branches/1.3.x/include/apr.h.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/include/apr.h.in?rev=661369&r1=661368&r2=661369&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/include/apr.h.in (original)
+++ apr/apr/branches/1.3.x/include/apr.h.in Thu May 29 08:47:52 2008
@@ -109,6 +109,7 @@
 #define APR_HAVE_WINSOCK2_H      @winsock2h@
 
 /** @} */
+/** @} */
 
 /* We don't include our conditional headers within the doxyblocks 
  * or the extern "C" namespace 
@@ -467,7 +468,6 @@
 /* Local machine definition for console and log output. */
 #define APR_EOL_STR              "@eolstr@"
 
-
 #if APR_HAVE_SYS_WAIT_H
 #ifdef WEXITSTATUS
 #define apr_wait_t       int
@@ -480,13 +480,6 @@
 typedef int apr_wait_t;
 #endif /* HAVE_SYS_WAIT_H */
 
-/* XXXX: These don't belong here, but it is replicating what apr.hw does. */
-#ifdef __MINGW32__
-typedef  int         pid_t;
-typedef  int         uid_t;
-typedef  int         gid_t;
-#endif
-
 #if defined(PATH_MAX)
 #define APR_PATH_MAX       PATH_MAX
 #elif defined(_POSIX_PATH_MAX)
@@ -498,7 +491,19 @@
 #define APR_DSOPATH "@shlibpath_var@"
 
 /** @} */
-/** @} */
+
+/* Definitions that only Win32 programs need to compile properly. */
+
+/* XXX These simply don't belong here, perhaps in apr_portable.h
+ * based on some APR_HAVE_PID/GID/UID?
+ */
+#ifdef __MINGW32__
+#ifndef __GNUC__
+typedef  int         pid_t;
+#endif
+typedef  int         uid_t;
+typedef  int         gid_t;
+#endif
 
 #ifdef __cplusplus
 }



Mime
View raw message