blob: 192eb5b99f731cd2c4a8d816cd3d535d56991dc0 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
--- mozilla/gfx/skia/Makefile.in~
+++ mozilla/gfx/skia/Makefile.in
@@ -339,10 +339,9 @@ CPPSRCS += \
SkMMapStream.cpp \
SkOSFile.cpp \
$(NULL)
-ifeq (Linux,$(OS_TARGET))
+ifneq (,$(or $(MOZ_X11),$(filter Linux,$(OS_TARGET))))
CPPSRCS += \
SkFontHost_linux.cpp \
- SkFontHost_tables.cpp \
SkTime_Unix.cpp \
$(NULL)
endif
--- mozilla/widget/qt/nsNativeThemeQt.cpp~
+++ mozilla/widget/qt/nsNativeThemeQt.cpp
@@ -25,7 +25,6 @@
#include "nsThemeConstants.h"
#include "nsIServiceManager.h"
#include "nsIDOMHTMLInputElement.h"
-#include <malloc.h>
#include "gfxASurface.h"
--- mozilla/widget/qt/nsSound.cpp~
+++ mozilla/widget/qt/nsSound.cpp
@@ -40,6 +40,7 @@
#include <QSound>
#include <string.h>
+#include <unistd.h>
#include "nscore.h"
#include "plstr.h"
|
