apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From roo...@apache.org
Subject svn commit: r472955 - in /apr/apr-util/branches/1.2.x: CHANGES include/apr_queue.h
Date Thu, 09 Nov 2006 15:52:38 GMT
Author: rooneg
Date: Thu Nov  9 07:52:37 2006
New Revision: 472955

URL: http://svn.apache.org/viewvc?view=rev&rev=472955
Log:
Merge r471787 from trunk to the 1.2.x branch.

Allow apr_queue.h to be included before other APR headers.

Modified:
    apr/apr-util/branches/1.2.x/CHANGES
    apr/apr-util/branches/1.2.x/include/apr_queue.h

Modified: apr/apr-util/branches/1.2.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/CHANGES?view=diff&rev=472955&r1=472954&r2=472955
==============================================================================
--- apr/apr-util/branches/1.2.x/CHANGES (original)
+++ apr/apr-util/branches/1.2.x/CHANGES Thu Nov  9 07:52:37 2006
@@ -3,6 +3,9 @@
   *) Add support for Berkeley DB 4.5 to the configure scripts.
      [Garrett Rooney]
 
+  *) Allow apr_queue.h to be included before other APR headers.
+     PR 40891 [Henry Jen <henryjen ztune.net>]
+
   *) Provide folding in autogenerated .manifest files for Win32 builders
      using VisualStudio 2005  [William Rowe]
 

Modified: apr/apr-util/branches/1.2.x/include/apr_queue.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/include/apr_queue.h?view=diff&rev=472955&r1=472954&r2=472955
==============================================================================
--- apr/apr-util/branches/1.2.x/include/apr_queue.h (original)
+++ apr/apr-util/branches/1.2.x/include/apr_queue.h Thu Nov  9 07:52:37 2006
@@ -17,7 +17,6 @@
 #ifndef APR_QUEUE_H
 #define APR_QUEUE_H
 
-#if APR_HAS_THREADS
 /**
  * @file apr_queue.h
  * @brief Thread Safe FIFO bounded queue
@@ -29,6 +28,8 @@
 #include "apu.h"
 #include "apr_errno.h"
 #include "apr_pools.h"
+
+#if APR_HAS_THREADS
 
 #ifdef __cplusplus
 extern "C" {



Mime
View raw message