TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.9.x'

Browse Source
This commit is contained in:
rdb 2015-06-04 12:00:25 +02:00
commit 205e731c4a
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dtool/src/dtoolbase/dtoolbase.h
View File

@ -430,14 +430,18 @@
/* These symbols are used in dtoolsymbols.h and pandasymbols.h. */ /* These symbols are used in dtoolsymbols.h and pandasymbols.h. */
#if defined(WIN32_VC) && !defined(CPPPARSER) && !defined(LINK_ALL_STATIC) #if defined(WIN32_VC) && !defined(CPPPARSER) && !defined(LINK_ALL_STATIC)
#define EXPORT_CLASS __declspec(dllexport) #define EXPORT_CLASS __declspec(dllexport)
#define EXPORT_TEMPL
#define IMPORT_CLASS __declspec(dllimport) #define IMPORT_CLASS __declspec(dllimport)
#define IMPORT_TEMPL extern
#else #else
#define EXPORT_CLASS #define EXPORT_CLASS
#define EXPORT_TEMPL
#define IMPORT_CLASS #define IMPORT_CLASS
#endif
/* "extern template" is now part of the C++11 standard. */
#if !defined(CPPPARSER) && !defined(LINK_ALL_STATIC)
#define EXPORT_TEMPL
#define IMPORT_TEMPL extern #define IMPORT_TEMPL extern
#else
#define EXPORT_TEMPL
#define IMPORT_TEMPL
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
@ -445,4 +449,3 @@
#endif #endif
#endif #endif

2
dtool/src/dtoolbase/pdtoa.cxx
View File

@ -30,6 +30,8 @@ THE SOFTWARE.
#if defined(_MSC_VER) #if defined(_MSC_VER)
#include <intrin.h> #include <intrin.h>
#include <float.h>
#define copysign _copysign
#endif #endif
#define UINT64_C2(h, l) ((static_cast<uint64_t>(h) << 32) | static_cast<uint64_t>(l)) #define UINT64_C2(h, l) ((static_cast<uint64_t>(h) << 32) | static_cast<uint64_t>(l))