forked from mirrors/gecko-dev
Bug 1349002 - Build DMD with unified sources. r=njn
DMD can be built with unified sources, additionally it doesn't need NSPR's strcpy to build properly. MozReview-Commit-ID: 9hZFlpWdt7
This commit is contained in:
parent
5900bf90c0
commit
3d78211d31
2 changed files with 3 additions and 10 deletions
|
|
@ -20,6 +20,8 @@
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <process.h>
|
#include <process.h>
|
||||||
#else
|
#else
|
||||||
|
#include <pthread.h>
|
||||||
|
#include <sys/types.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
@ -440,9 +442,6 @@ public:
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#include <pthread.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
|
|
||||||
class MutexBase
|
class MutexBase
|
||||||
{
|
{
|
||||||
pthread_mutex_t mMutex;
|
pthread_mutex_t mMutex;
|
||||||
|
|
@ -527,8 +526,6 @@ public:
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#include <pthread.h>
|
|
||||||
|
|
||||||
#define DMD_TLS_INDEX_TYPE pthread_key_t
|
#define DMD_TLS_INDEX_TYPE pthread_key_t
|
||||||
#define DMD_CREATE_TLS_INDEX(i_) pthread_key_create(&(i_), nullptr)
|
#define DMD_CREATE_TLS_INDEX(i_) pthread_key_create(&(i_), nullptr)
|
||||||
#define DMD_DESTROY_TLS_INDEX(i_) pthread_key_delete((i_))
|
#define DMD_DESTROY_TLS_INDEX(i_) pthread_key_delete((i_))
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ EXPORTS += [
|
||||||
'DMD.h',
|
'DMD.h',
|
||||||
]
|
]
|
||||||
|
|
||||||
SOURCES += [
|
UNIFIED_SOURCES += [
|
||||||
'../../../mfbt/HashFunctions.cpp',
|
'../../../mfbt/HashFunctions.cpp',
|
||||||
'../../../mfbt/JSONWriter.cpp',
|
'../../../mfbt/JSONWriter.cpp',
|
||||||
'../../../mfbt/Poison.cpp',
|
'../../../mfbt/Poison.cpp',
|
||||||
|
|
@ -16,10 +16,6 @@ SOURCES += [
|
||||||
'DMD.cpp',
|
'DMD.cpp',
|
||||||
]
|
]
|
||||||
|
|
||||||
SOURCES += [
|
|
||||||
'../../../nsprpub/lib/libc/src/strcpy.c',
|
|
||||||
]
|
|
||||||
|
|
||||||
SharedLibrary('dmd')
|
SharedLibrary('dmd')
|
||||||
|
|
||||||
DEFINES['MOZ_NO_MOZALLOC'] = True
|
DEFINES['MOZ_NO_MOZALLOC'] = True
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue