You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2007/06/01 04:46:07 UTC

svn commit: r543371 - /apr/apr/trunk/include/arch/win32/apr_arch_misc.h

Author: wrowe
Date: Thu May 31 19:46:06 2007
New Revision: 543371

URL: http://svn.apache.org/viewvc?view=rev&rev=543371
Log:
Using macros defined include/arch/win32/apr_arch_misc.h to replace calls to the
crtdbg malloc variants, the PR is essentially solved.  Avoid using the crtdbg 
variants when building for Windows CE.

PR: 39888
Submitted by: Curt Arnold <carnold apache.org>

[Note: a rollup of the original patch + this patch is needed before backporting
the fix to 1.2 or 0.9 branches, something I have 0 cycles to do]

Modified:
    apr/apr/trunk/include/arch/win32/apr_arch_misc.h

Modified: apr/apr/trunk/include/arch/win32/apr_arch_misc.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/arch/win32/apr_arch_misc.h?view=diff&rev=543371&r1=543370&r2=543371
==============================================================================
--- apr/apr/trunk/include/arch/win32/apr_arch_misc.h (original)
+++ apr/apr/trunk/include/arch/win32/apr_arch_misc.h Thu May 31 19:46:06 2007
@@ -139,7 +139,7 @@
 #define ELSE_WIN_OS_IS_ANSI
 #endif /* WINNT */
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(_WIN32_WCE)
 #include "crtdbg.h"
 
 static APR_INLINE void* apr_malloc_dbg(size_t size, const char* filename,