[webkit-changes] cvs commit: JavaScriptCore/kjs array_object.cpp identifier.cpp internal.cpp

[David]

hyatt       06/01/06 14:49:06

  Modified:    kjs      array_object.cpp identifier.cpp internal.cpp
  Log:
  Fix build bustage on Mac.
  
  Revision  Changes    Path
  1.64      +3 -1      JavaScriptCore/kjs/array_object.cpp
  
  Index: array_object.cpp
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/kjs/array_object.cpp,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- array_object.cpp	6 Jan 2006 22:43:40 -0000	1.63
  +++ array_object.cpp	6 Jan 2006 22:49:04 -0000	1.64
  @@ -38,7 +38,9 @@
   #include <stdio.h>
   #include <assert.h>
   
  -template class KJS::JSObject * const & KXMLCore::identityExtract<class KJS::JSObject *>(class KJS::JSObject * const &);
  +#ifdef WIN32
  +template class KJS::JSObject * const & KXMLCore::identityExtract<class KJS::JSObject *>(class KJS::JSObject * const &);
  +#endif
   
   using namespace KJS;
   
  
  
  
  1.30      +3 -1      JavaScriptCore/kjs/identifier.cpp
  
  Index: identifier.cpp
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/kjs/identifier.cpp,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- identifier.cpp	6 Jan 2006 22:43:40 -0000	1.29
  +++ identifier.cpp	6 Jan 2006 22:49:05 -0000	1.30
  @@ -41,7 +41,9 @@
   #include <string.h> // for strlen
   #include <new> // for placement new
   
  -template struct KJS::UString::Rep * const & KXMLCore::identityExtract<struct KJS::UString::Rep *>(struct KJS::UString::Rep * const &);
  +#ifdef WIN32
  +template struct KJS::UString::Rep * const & KXMLCore::identityExtract<struct KJS::UString::Rep *>(struct KJS::UString::Rep * const &);
  +#endif
   
   namespace KXMLCore {
   
  
  
  
  1.87      +1 -2      JavaScriptCore/kjs/internal.cpp
  
  Index: internal.cpp
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/kjs/internal.cpp,v
  retrieving revision 1.86
  retrieving revision 1.87
  diff -u -r1.86 -r1.87
  --- internal.cpp	6 Jan 2006 22:43:40 -0000	1.86
  +++ internal.cpp	6 Jan 2006 22:49:05 -0000	1.87
  @@ -50,10 +50,9 @@
   #if WIN32
   #include <float.h>
   #define copysign(a, b) _copysign(a, b)
  +template void * const & KXMLCore::extractFirst<struct std::pair<void *,void *> >(struct std::pair<void *, void *> const &);
   #endif
   
  -template void * const & KXMLCore::extractFirst<struct std::pair<void *,void *>>(struct std::pair<void *, void *> const &);
  -
   extern int kjsyyparse();
   
   namespace KJS {