svn commit: r1102145 - in /apr/apr/trunk: include/arch/win32/apr_dbg_win32_handles.h include/arch/win32/apr_private.h misc/win32/misc.c

[tr...@apache.org]

Author: trawick
Date: Thu May 12 00:14:54 2011
New Revision: 1102145

URL: http://svn.apache.org/viewvc?rev=1102145&view=rev
Log:
revert r1102138, as the feature is supposed to be
usable by including apr_dbg_win32_handles.h in any
particular source file, which in turn requires that
apr_dbg_log() always be exported

Modified:
    apr/apr/trunk/include/arch/win32/apr_dbg_win32_handles.h
    apr/apr/trunk/include/arch/win32/apr_private.h
    apr/apr/trunk/misc/win32/misc.c

Modified: apr/apr/trunk/include/arch/win32/apr_dbg_win32_handles.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/arch/win32/apr_dbg_win32_handles.h?rev=1102145&r1=1102144&r2=1102145&view=diff
==============================================================================
--- apr/apr/trunk/include/arch/win32/apr_dbg_win32_handles.h (original)
+++ apr/apr/trunk/include/arch/win32/apr_dbg_win32_handles.h Thu May 12 00:14:54 2011
@@ -23,12 +23,9 @@ extern "C" {
 
 /* USAGE:
  * 
- * To enable for APR only:
- *   Define APR_DBG_WIN32_HANDLES at compile time, or edit apr_private.h
- *   and make the include of apr_dbg_win32_handles.h unconditional.
- *
- * To enable for APR applications as well:
- *   Copy this header into apr/include add the include below to apr.h.
+ * Add the following include to apr_private.h for internal debugging,
+ * or copy this header into apr/include add the include below to apr.h
+ * for really global debugging;
  *
  *   #include "apr_dbg_win32_handles.h"
  *
@@ -56,10 +53,6 @@ extern "C" {
  * treated as a handle.
  */
 
-#ifndef APR_DBG_WIN32_HANDLES
-#define APR_DBG_WIN32_HANDLES
-#endif
-
 APR_DECLARE_NONSTD(HANDLE) apr_dbg_log(char* fn, HANDLE ha, char* fl, int ln, 
                                        int nh,/* HANDLE *hv, char *dsc */...);
 

Modified: apr/apr/trunk/include/arch/win32/apr_private.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/arch/win32/apr_private.h?rev=1102145&r1=1102144&r2=1102145&view=diff
==============================================================================
--- apr/apr/trunk/include/arch/win32/apr_private.h (original)
+++ apr/apr/trunk/include/arch/win32/apr_private.h Thu May 12 00:14:54 2011
@@ -193,12 +193,4 @@ APR_DECLARE_DATA int errno;
 #include <process.h>
 #endif
 
-/* Define APR_DBG_WIN32_HANDLES for the APR build, or just unconditionally
- * include apr_dbg_win32_handles.h below to enable handle debugging for
- * APR internals.  See apr_dbg_win32_handles.h for more information.
- */
-#ifdef APR_DBG_WIN32_HANDLES
-#include "apr_dbg_win32_handles.h"
-#endif
-
 #endif  /*APR_PRIVATE_H*/

Modified: apr/apr/trunk/misc/win32/misc.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/misc/win32/misc.c?rev=1102145&r1=1102144&r2=1102145&view=diff
==============================================================================
--- apr/apr/trunk/misc/win32/misc.c (original)
+++ apr/apr/trunk/misc/win32/misc.c Thu May 12 00:14:54 2011
@@ -17,6 +17,7 @@
 #include "apr_private.h"
 #include "apr_arch_misc.h"
 #include "apr_arch_file_io.h"
+#include "apr_dbg_win32_handles.h"
 #include "assert.h"
 #include "apr_lib.h"
 #include "tchar.h"
@@ -191,10 +192,7 @@ FARPROC apr_load_dll_func(apr_dlltoken_e
 }
 
 /* Declared in include/arch/win32/apr_dbg_win32_handles.h
- * Enabled by defining APR_DBG_WIN32_HANDLES or by including
- * apr_dbg_win32_handles.h in specific files.
  */
-#ifdef APR_DBG_WIN32_HANDLES
 APR_DECLARE_NONSTD(HANDLE) apr_dbg_log(char* fn, HANDLE ha, char* fl, int ln, 
                                        int nh, /* HANDLE hv, char *dsc */...)
 {
@@ -267,4 +265,3 @@ APR_DECLARE_NONSTD(HANDLE) apr_dbg_log(c
     }
     return ha;
 }
-#endif /* ifdef APR_DBG_WIN32_HANDLES */