equal
deleted
inserted
replaced
19 libs:: greprefs.js |
19 libs:: greprefs.js |
20 $(INSTALL) $^ $(DIST)/bin/ |
20 $(INSTALL) $^ $(DIST)/bin/ |
21 diff --git a/modules/libpref/src/nsPrefService.cpp b/modules/libpref/src/nsPrefService.cpp |
21 diff --git a/modules/libpref/src/nsPrefService.cpp b/modules/libpref/src/nsPrefService.cpp |
22 --- a/modules/libpref/src/nsPrefService.cpp |
22 --- a/modules/libpref/src/nsPrefService.cpp |
23 +++ b/modules/libpref/src/nsPrefService.cpp |
23 +++ b/modules/libpref/src/nsPrefService.cpp |
24 @@ -51,16 +51,17 @@ |
24 @@ -55,16 +55,17 @@ |
25 #include "nsILocalFile.h" |
25 #include "nsIStringEnumerator.h" |
26 #include "nsIObserverService.h" |
26 #include "nsIZipReader.h" |
27 #include "nsPrefBranch.h" |
27 #include "nsPrefBranch.h" |
28 #include "nsXPIDLString.h" |
28 #include "nsXPIDLString.h" |
29 #include "nsCRT.h" |
29 #include "nsCRT.h" |
30 #include "nsCOMArray.h" |
30 #include "nsCOMArray.h" |
31 #include "nsXPCOMCID.h" |
31 #include "nsXPCOMCID.h" |
37 #include "pldhash.h" |
37 #include "pldhash.h" |
38 |
38 |
39 #include "prefapi.h" |
39 #include "prefapi.h" |
40 #include "prefread.h" |
40 #include "prefread.h" |
41 #include "prefapi_private_data.h" |
41 #include "prefapi_private_data.h" |
42 @@ -718,28 +719,40 @@ static nsresult pref_InitDefaults() |
42 @@ -837,28 +838,40 @@ static nsresult pref_InitDefaults() |
43 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ |
43 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ |
44 static const char* specialFiles[] = { |
44 static const char* specialFiles[] = { |
45 #if defined(XP_MAC) || defined(XP_MACOSX) |
45 #if defined(XP_MAC) || defined(XP_MACOSX) |
46 "macprefs.js" |
46 "macprefs.js" |
47 #elif defined(XP_WIN) |
47 #elif defined(XP_WIN) |
2086 #define NS_UNIXSYSTEMPROXYSERVICE_CID /* 0fa3158c-d5a7-43de-9181-a285e74cf1d4 */\ |
2086 #define NS_UNIXSYSTEMPROXYSERVICE_CID /* 0fa3158c-d5a7-43de-9181-a285e74cf1d4 */\ |
2087 { 0x0fa3158c, 0xd5a7, 0x43de, \ |
2087 { 0x0fa3158c, 0xd5a7, 0x43de, \ |
2088 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
2088 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
2089 --- a/toolkit/xre/Makefile.in |
2089 --- a/toolkit/xre/Makefile.in |
2090 +++ b/toolkit/xre/Makefile.in |
2090 +++ b/toolkit/xre/Makefile.in |
2091 @@ -95,17 +95,18 @@ CMMSRCS = nsNativeAppSupportCocoa.mm |
2091 @@ -97,17 +97,18 @@ CMMSRCS = nsNativeAppSupportCocoa.mm |
2092 else |
2092 else |
2093 ifeq ($(MOZ_WIDGET_TOOLKIT),os2) |
2093 ifeq ($(MOZ_WIDGET_TOOLKIT),os2) |
2094 CPPSRCS += nsNativeAppSupportOS2.cpp |
2094 CPPSRCS += nsNativeAppSupportOS2.cpp |
2095 else |
2095 else |
2096 ifeq ($(MOZ_WIDGET_TOOLKIT),beos) |
2096 ifeq ($(MOZ_WIDGET_TOOLKIT),beos) |
3102 |
3102 |
3103 // Now look up our extensions |
3103 // Now look up our extensions |
3104 diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in |
3104 diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in |
3105 --- a/widget/src/gtk2/Makefile.in |
3105 --- a/widget/src/gtk2/Makefile.in |
3106 +++ b/widget/src/gtk2/Makefile.in |
3106 +++ b/widget/src/gtk2/Makefile.in |
3107 @@ -155,11 +155,14 @@ endif |
3107 @@ -157,11 +157,14 @@ endif |
3108 |
3108 |
3109 DEFINES += -DCAIRO_GFX |
3109 DEFINES += -DCAIRO_GFX |
3110 |
3110 |
3111 INCLUDES += \ |
3111 INCLUDES += \ |
3112 -I$(srcdir)/../xpwidgets \ |
3112 -I$(srcdir)/../xpwidgets \ |
3456 |
3456 |
3457 #endif |
3457 #endif |
3458 diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in |
3458 diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in |
3459 --- a/xpcom/components/Makefile.in |
3459 --- a/xpcom/components/Makefile.in |
3460 +++ b/xpcom/components/Makefile.in |
3460 +++ b/xpcom/components/Makefile.in |
3461 @@ -98,10 +98,11 @@ FORCE_STATIC_LIB = 1 |
3461 @@ -94,10 +94,11 @@ FORCE_STATIC_LIB = 1 |
3462 |
3462 |
3463 # Force use of PIC |
3463 # Force use of PIC |
3464 FORCE_USE_PIC = 1 |
3464 FORCE_USE_PIC = 1 |
3465 include $(topsrcdir)/config/rules.mk |
3465 include $(topsrcdir)/config/rules.mk |
3466 |
3466 |