FS-2738

diff --git a/libs/apr/.update b/libs/apr/.update
index 097f707e64b8b188694a2e83dbd92d8f4370a091..d5bc43d9d4050b8272100935576d145a690ed5df 100644 (file)
--- a/libs/apr/.update
+++ b/libs/apr/.update
@@ -1 +1 @@
-Thu Nov 19 09:24:37 EST 2009
+Mon Sep 27 13:15:54 CDT 2010

diff --git a/libs/apr/strings/apr_snprintf.c b/libs/apr/strings/apr_snprintf.c
index fe8b382d147f7379e5af1ac2df81d2dcb314142a..4f59f92c764f117df7e977c10982bcc9e82e4174 100644 (file)
--- a/libs/apr/strings/apr_snprintf.c
+++ b/libs/apr/strings/apr_snprintf.c
@@ -824,7 +824,13 @@ APR_DECLARE(int) apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *),
              * Modifier check.  Note that if APR_INT64_T_FMT is "d",
              * the first if condition is never true.
              */
-            if ((sizeof(APR_INT64_T_FMT) == 4 &&
+
+                       /* HACK BY FREESWITCH TEAM TO FIX COMPATIBILITY 2010-09-27 */
+                       if (*fmt == 'l' && *(fmt + 1) == 'l') {
+                var_type = IS_QUAD;
+                               fmt += 2;
+                       }
+            else if ((sizeof(APR_INT64_T_FMT) == 4 &&
                  fmt[0] == APR_INT64_T_FMT[0] &&
                  fmt[1] == APR_INT64_T_FMT[1]) ||
                 (sizeof(APR_INT64_T_FMT) == 3 &&
@@ -843,6 +849,11 @@ APR_DECLARE(int) apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *),
             else if (*fmt == 'l') {
                 var_type = IS_LONG;
                 fmt++;
+                               /* HACK BY FREESWITCH TEAM TO FIX COMPATIBILITY 2010-09-27 */
+                               if (*fmt == 'l') {
+                                       var_type = IS_QUAD;
+                                       fmt++;
+                               }
             }
             else if (*fmt == 'h') {
                 var_type = IS_SHORT;