Fix for talloc, in order to improve mesa shader compiler performance on windows from abysmal to m...

third_party/talloc/chromium.patch

 diff -c -r talloc-2.0.1/talloc.c talloc/talloc.c
 *** talloc-2.0.1/talloc.c       Tue Dec 15 06:16:57 2009
---- talloc/talloc.c     Mon Oct 25 13:58:42 2010
+--- talloc/talloc.c     Fri Mar 18 13:03:11 2011
 ***************
 *** 30,36 ****
     inspired by http://swapped.cc/halloc/
   */
   
 ! #include "replace.h"
   #include "talloc.h"
   
   #ifdef TALLOC_BUILD_VERSION_MAJOR
 --- 30,37 ----
@@ skipping 264 matching lines @@
         char *ret;
 --- 1613,1619 ----
         return __talloc_strlendup(t, p, strnlen(p, n));
   }
   
 ! static INLINE char *__talloc_strlendup_append(char *s, size_t slen,
                                               const char *a, size_t alen)
   {
         char *ret;
 ***************
-*** 1736,1749 ****
+*** 1699,1709 ****
+        int len;
+        char *ret;
+        va_list ap2;
+-       char c;
+  
+-       /* this call looks strange, but it makes it work on older solaris boxes */
+        va_copy(ap2, ap);
+!       len = vsnprintf(&c, 1, fmt, ap2);
+        va_end(ap2);
+        if (unlikely(len < 0)) {
+                return NULL;
+--- 1722,1730 ----
+        int len;
+        char *ret;
+        va_list ap2;
+  
+        va_copy(ap2, ap);
+!       len = vsnprintf(NULL, 0, fmt, ap2);
+        va_end(ap2);
+        if (unlikely(len < 0)) {
+                return NULL;
+***************
+*** 1736,1754 ****
         return ret;
   }
   
 ! static inline char *__talloc_vaslenprintf_append(char *s, size_t slen,
                                                  const char *fmt, va_list ap)
                                                  PRINTF_ATTRIBUTE(3,0);
   
 ! static inline char *__talloc_vaslenprintf_append(char *s, size_t slen,
                                                  const char *fmt, va_list ap)
   {
         ssize_t alen;
         va_list ap2;
-        char c;
+-       char c;
   
---- 1759,1777 ----
+        va_copy(ap2, ap);
+!       alen = vsnprintf(&c, 1, fmt, ap2);
+        va_end(ap2);
+  
+        if (alen <= 0) {
+--- 1757,1779 ----
         return ret;
   }
   
 ! static INLINE char *__talloc_vaslenprintf_append(char *s, size_t slen,
                                                  const char *fmt, va_list ap)
                                                  PRINTF_ATTRIBUTE(3,0);
   
 ! static INLINE char *__talloc_vaslenprintf_append(char *s, size_t slen,
                                                  const char *fmt, va_list ap)
   {
 +       /* ssize_t isn't present on Windows. */
 + #ifndef _MSC_VER
         ssize_t alen;
 + #else
 +       size_t alen;
 + #endif
         va_list ap2;
-        char c;
   
+        va_copy(ap2, ap);
+!       alen = vsnprintf(NULL, 0, fmt, ap2);
+        va_end(ap2);
+  
+        if (alen <= 0) {
 diff -c -r talloc-2.0.1/talloc.h talloc/talloc.h
 *** talloc-2.0.1/talloc.h       Wed Oct 28 16:14:20 2009
---- talloc/talloc.h     Mon Oct 25 15:11:18 2010
+--- talloc/talloc.h     Fri Mar 18 13:03:02 2011
 ***************
 *** 28,33 ****
 --- 28,37 ----
   #include <stdlib.h>
   #include <stdio.h>
   #include <stdarg.h>
 + #ifndef _MSC_VER
 + #include <stdint.h>
 + #endif
 + #include <string.h>
   
   #define TALLOC_VERSION_MAJOR 2
   #define TALLOC_VERSION_MINOR 0