Changeset 41823 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Mar 18, 2009, 9:42:21 PM (16 years ago)

Author:

[email protected]

Message:

Rolling out r41818 since it broke the windows build.
Error: ..\..\runtime\DatePrototype.cpp(30) : fatal error C1083: Cannot open include file: 'langinfo.h': No such file or directory

• runtime/DatePrototype.cpp: (JSC::formatLocaleDate):

File:

• trunk/JavaScriptCore/runtime/DatePrototype.cpp (modified) (3 diffs)

trunk/JavaScriptCore/runtime/DatePrototype.cpp

@@ -28 +28 @@
 #include "DateInstance.h"
 #include <float.h>
-#include <langinfo.h>
 #include <limits.h>
 #include <locale.h>
@@ -183 +182 @@
 static JSCell* formatLocaleDate(ExecState* exec, const GregorianDateTime& gdt, LocaleDateTimeFormat format)
 {
-    static const nl_item formats[] = { D_T_FMT, D_FMT, T_FMT };
+    static const char* const formatStrings[] = { "%#c", "%#x", "%X" };
  
     // Offset year if needed
@@ -192 +191 @@
         localTM.tm_year = equivalentYearForDST(year) - 1900;
  
-    // We do not allow strftime to generate dates with 2-digits years,
-    // both to avoid ambiguity, and a crash in strncpy, for years that
-    // need offset.
-    char* formatString = strdup(nl_langinfo(formats[format]));
-    char* yPos = strchr(formatString, 'y');
-    if (yPos)
-        *yPos = 'Y';
-
     // Do the formatting
     const int bufsize = 128;
     char timebuffer[bufsize];
-    size_t ret = strftime(timebuffer, bufsize, formatString, &localTM);
-
-    free(formatString);
+    size_t ret = strftime(timebuffer, bufsize, formatStrings[format], &localTM);
  
     if (ret == 0)