apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r892177 - in /apr/apr/trunk: configure.in include/arch/win32/apr_private.h misc/win32/misc.c
Date Fri, 18 Dec 2009 08:29:52 GMT
Author: wrowe
Date: Fri Dec 18 08:29:51 2009
New Revision: 892177

URL: http://svn.apache.org/viewvc?rev=892177&view=rev
Log:
Yes, use the lfs64 flag to flag APR_HAS_LARGE_FILES

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

Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=892177&r1=892176&r2=892177&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Fri Dec 18 08:29:51 2009
@@ -496,7 +496,7 @@
        ac_cv_file__dev_zero="no"
        ac_cv_func_setpgrp_void="no"
        apr_cv_tcp_nodelay_with_cork="no"
-       apr_cv_use_lfs64="no"
+       apr_cv_use_lfs64="yes"
        enable_threads="system_threads"
        eolstr="\\r\\n"
        file_as_socket="0"

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=892177&r1=892176&r2=892177&view=diff
==============================================================================
--- apr/apr/trunk/include/arch/win32/apr_private.h (original)
+++ apr/apr/trunk/include/arch/win32/apr_private.h Fri Dec 18 08:29:51 2009
@@ -181,6 +181,8 @@
 /* Windows ODBC sql.h is always present */
 #define HAVE_SQL_H              1
 
+#define HAVE_ICONV_H 1
+
 /*
  * Windows does not have GDBM, and we always use the bundled (new) Expat
  */

Modified: apr/apr/trunk/misc/win32/misc.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/misc/win32/misc.c?rev=892177&r1=892176&r2=892177&view=diff
==============================================================================
--- apr/apr/trunk/misc/win32/misc.c (original)
+++ apr/apr/trunk/misc/win32/misc.c Fri Dec 18 08:29:51 2009
@@ -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"
@@ -35,7 +36,7 @@
         {
             static unsigned int servpack = 0;
             TCHAR *pservpack;
-            if (pservpack = oslev.szCSDVersion) {
+            if ((pservpack = oslev.szCSDVersion)) {
                 while (*pservpack && !apr_isdigit(*pservpack)) {
                     pservpack++;
                 }
@@ -213,8 +214,8 @@
         sbuf[1023] = '\0';
         if (!fh) {
             (GetModuleFileNameA)(NULL, sbuf, 250);
-            sprintf(strchr(sbuf, '\0'), ".%d",
-                    (GetCurrentProcessId)());
+            sprintf(strchr(sbuf, '\0'), ".%u",
+                    (unsigned int)(GetCurrentProcessId)());
             fh = (CreateFileA)(sbuf, GENERIC_WRITE, 0, NULL, 
                             CREATE_ALWAYS, 0, NULL);
             (InitializeCriticalSection)(&cs);
@@ -223,7 +224,8 @@
 
     if (!nh) {
         (sprintf)(sbuf, "%p %08x %08x %s() %s:%d\n",
-                  ha, seq, GetCurrentThreadId(), fn, fl, ln);
+                  ha, (unsigned int)seq, (unsigned int)GetCurrentThreadId(),
+                  fn, fl, ln);
         (EnterCriticalSection)(&cs);
         (WriteFile)(fh, sbuf, (DWORD)strlen(sbuf), &wrote, NULL);
         (LeaveCriticalSection)(&cs);
@@ -250,7 +252,8 @@
                 }
             }
             (sprintf)(sbuf, "%p %08x %08x %s(%s) %s:%d\n",
-                      *hv, seq, GetCurrentThreadId(), 
+                      *hv, (unsigned int)seq,
+                      (unsigned int)GetCurrentThreadId(), 
                       fn, dsc, fl, ln);
             (WriteFile)(fh, sbuf, (DWORD)strlen(sbuf), &wrote, NULL);
         } while (--nh);



Mime
View raw message