зеркало из https://github.com/mozilla/pjs.git
Bug 242382 Trunk build failure in nsObjectFrame.cpp
patch by roland.mainz@nrubsig.org r=roc sr=roc
This commit is contained in:
Родитель
ded395653e
Коммит
7cd0f5a9f9
|
@ -53,9 +53,11 @@
|
|||
|
||||
// If some platform(s) can't handle our template that matches literal strings,
|
||||
// then we'll disable it on those platforms.
|
||||
#if !defined(NS_DISABLE_LITERAL_TEMPLATE) && (defined(_MSC_VER) && _MSC_VER < 1310)
|
||||
#define NS_DISABLE_LITERAL_TEMPLATE
|
||||
#endif
|
||||
#ifndef NS_DISABLE_LITERAL_TEMPLATE
|
||||
# if (defined(_MSC_VER) && (_MSC_VER < 1310)) || (defined(__SUNPRO_CC) & (__SUNPRO_CC < 0x560))
|
||||
# define NS_DISABLE_LITERAL_TEMPLATE
|
||||
# endif
|
||||
#endif /* !NS_DISABLE_LITERAL_TEMPLATE */
|
||||
|
||||
#include <string.h>
|
||||
|
||||
|
|
|
@ -47,9 +47,11 @@
|
|||
|
||||
// If some platform(s) can't handle our template that matches literal strings,
|
||||
// then we'll disable it on those platforms.
|
||||
#if !defined(NS_DISABLE_LITERAL_TEMPLATE) && (defined(_MSC_VER) && _MSC_VER < 1310)
|
||||
#define NS_DISABLE_LITERAL_TEMPLATE
|
||||
#endif
|
||||
#ifndef NS_DISABLE_LITERAL_TEMPLATE
|
||||
# if (defined(_MSC_VER) && (_MSC_VER < 1310)) || (defined(__SUNPRO_CC) & (__SUNPRO_CC < 0x560))
|
||||
# define NS_DISABLE_LITERAL_TEMPLATE
|
||||
# endif
|
||||
#endif /* !NS_DISABLE_LITERAL_TEMPLATE */
|
||||
|
||||
#include <string.h>
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче