From kde-commits Sun May 09 14:50:49 2010 From: Maks Orlovich Date: Sun, 09 May 2010 14:50:49 +0000 To: kde-commits Subject: KDE/kdelibs/kjs Message-Id: <20100509145049.B9166AC8B1 () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=127341637012580 SVN commit 1124584 by orlovich: Export inf as well.. And remove a double declaration. M +1 -0 JSImmediate.h M +5 -5 fpconst.cpp M +0 -3 value.h --- trunk/KDE/kdelibs/kjs/JSImmediate.h #1124583:1124584 @@ -48,6 +48,7 @@ class UString; KJS_EXPORT extern const double NaN; +KJS_EXPORT extern const double Inf; /* * A JSValue* is either a pointer to a cell (a heap-allocated object) or an immediate (a type-tagged --- trunk/KDE/kdelibs/kjs/fpconst.cpp #1124583:1124584 @@ -34,18 +34,18 @@ #if (defined(AVOID_STATIC_CONSTRUCTORS) && !AVOID_STATIC_CONSTRUCTORS) KJS_EXPORT extern const double NaN = NAN; - extern const double Inf = INFINITY; + KJS_EXPORT extern const double Inf = INFINITY; #elif PLATFORM(DARWIN) #if PLATFORM(BIG_ENDIAN) KJS_EXPORT extern const unsigned char NaN[sizeof(double)] = { 0x7f, 0xf8, 0, 0, 0, 0, 0, 0 }; - extern const unsigned char Inf[sizeof(double)] = { 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 }; + KJS_EXPORT extern const unsigned char Inf[sizeof(double)] = { 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 }; #elif PLATFORM(MIDDLE_ENDIAN) KJS_EXPORT extern const unsigned char NaN[] = { 0, 0, 0xf8, 0x7f, 0, 0, 0, 0 }; - extern const unsigned char Inf[] = { 0, 0, 0xf0, 0x7f, 0, 0, 0, 0 }; + KJS_EXPORT extern const unsigned char Inf[] = { 0, 0, 0xf0, 0x7f, 0, 0, 0, 0 }; #else KJS_EXPORT extern const unsigned char NaN[sizeof(double)] = { 0, 0, 0, 0, 0, 0, 0xf8, 0x7f }; - extern const unsigned char Inf[sizeof(double)] = { 0, 0, 0, 0, 0, 0, 0xf0, 0x7f }; + KJS_EXPORT extern const unsigned char Inf[sizeof(double)] = { 0, 0, 0, 0, 0, 0, 0xf0, 0x7f }; #endif // PLATFORM(MIDDLE_ENDIAN) #else // !PLATFORM(DARWIN) @@ -79,7 +79,7 @@ } } ; KJS_EXPORT extern const double NaN = NaNInf.doubles.NaN_Double; - extern const double Inf = NaNInf.doubles.Inf_Double; + KJS_EXPORT extern const double Inf = NaNInf.doubles.Inf_Double; #endif // !PLATFORM(DARWIN) --- trunk/KDE/kdelibs/kjs/value.h #1124583:1124584 @@ -211,9 +211,6 @@ // DOM object that contains a UString JSCell *jsOwnedString(const UString&); -KJS_EXPORT extern const double NaN; -KJS_EXPORT extern const double Inf; - inline JSValue* jsUndefined() { return JSImmediate::undefinedImmediate();