Changeset 7798 in webkit for trunk/JavaScriptCore/kjs/ustring.cpp

Timestamp:

Oct 9, 2004, 3:17:44 PM (21 years ago)

Author:

darin

Message:

Reviewed by Kevin.

• fixed <rdar://problem/3804661> REGRESSION: JavaScriptCore framework now has two init routines

• bindings/NP_jsobject.cpp: Fixed unnecessarily-complex globals set up that was creating an init routine.

• kjs/ustring.cpp: Changed around the UString::Rep::empty construction to not require a global constructor that creates an init routine.

File:

• trunk/JavaScriptCore/kjs/ustring.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -143 +143 @@
 }
 
-static UChar dummy;
+// Hack here to avoid a global with a constructor; point to an unsigned short instead of a UChar.
+static unsigned short almostUChar;
+static UChar *const nonNullUCharPointer = reinterpret_cast<UChar *>(&almostUChar);
 UString::Rep UString::Rep::null = { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 };
-UString::Rep UString::Rep::empty = { 0, 0, 1, 0, 0, 0, &dummy, 0, 0, 0, 0 };
+UString::Rep UString::Rep::empty = { 0, 0, 1, 0, 0, 0, nonNullUCharPointer, 0, 0, 0, 0 };
 const int normalStatBufferSize = 4096;
 static char *statBuffer = 0;