From 5925ac3dcb776a363ee6169c9b68194135925486 Mon Sep 17 00:00:00 2001 From: Dmitry Savintsev Date: Fri, 15 Feb 2013 15:48:44 +0100 Subject: [PATCH 1/7] miscellaneous fixes (merged from later Firefox issues) to make it compile with gcc-4.7 - fixes issue #7 --- ipc/chromium/src/base/file_util.cc | 6 ++++-- ipc/chromium/src/base/file_util_linux.cc | 2 ++ ipc/chromium/src/base/message_pump_libevent.cc | 2 ++ ipc/chromium/src/base/time_posix.cc | 1 + security/nss/lib/softoken/secmodt.h | 3 ++- .../google-breakpad/src/common/linux/Makefile.in | 4 ++++ xpcom/build/nsXPCOMPrivate.h | 8 ++++---- xpcom/glue/standalone/nsGlueLinkingDlopen.cpp | 2 +- 8 files changed, 20 insertions(+), 8 deletions(-) diff --git a/ipc/chromium/src/base/file_util.cc b/ipc/chromium/src/base/file_util.cc index 1154fedf..48a36065 100644 --- a/ipc/chromium/src/base/file_util.cc +++ b/ipc/chromium/src/base/file_util.cc @@ -8,9 +8,11 @@ #include #endif #include -#if defined(ANDROID) +// /home/dsavints/dev/hack/dominator/ipc/chromium/src/base/file_util.cc (D.S.) +// commented out #if defined(ANDROID) to prevent the compile error due to undefine ftrunctate +//#if defined(ANDROID) #include -#endif +//#endif #include diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc index cca706f0..55be87d8 100644 --- a/ipc/chromium/src/base/file_util_linux.cc +++ b/ipc/chromium/src/base/file_util_linux.cc @@ -5,6 +5,8 @@ #include "base/file_util.h" #include +// https://bugzilla.mozilla.org/show_bug.cgi?id=736765 - added unistd.h to avoid compile error (DS) +#include #include #include diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc index b537988e..dd9e2836 100644 --- a/ipc/chromium/src/base/message_pump_libevent.cc +++ b/ipc/chromium/src/base/message_pump_libevent.cc @@ -6,6 +6,8 @@ #include #include +// https://bugzilla.mozilla.org/show_bug.cgi?id=746526 - added unistd.h to avoid compile error (D.S.) +#include #include "eintr_wrapper.h" #include "base/logging.h" diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc index 10149626..2638896f 100644 --- a/ipc/chromium/src/base/time_posix.cc +++ b/ipc/chromium/src/base/time_posix.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/time.h" +#include #ifdef OS_MACOSX #include diff --git a/security/nss/lib/softoken/secmodt.h b/security/nss/lib/softoken/secmodt.h index 59fdca04..96afe52c 100644 --- a/security/nss/lib/softoken/secmodt.h +++ b/security/nss/lib/softoken/secmodt.h @@ -337,8 +337,9 @@ typedef PRUint32 PK11AttrFlags; /* default module configuration strings */ #define SECMOD_SLOT_FLAGS "slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512]" +// https://bugzilla.mozilla.org/show_bug.cgi?id=698264 - dmitris #define SECMOD_MAKE_NSS_FLAGS(fips,slot) \ -"Flags=internal,critical"fips" slotparams=("#slot"={"SECMOD_SLOT_FLAGS"})" +"Flags=internal,critical" fips" slotparams=("#slot"={" SECMOD_SLOT_FLAGS"})" #define SECMOD_INT_NAME "NSS Internal PKCS #11 Module" #define SECMOD_INT_FLAGS SECMOD_MAKE_NSS_FLAGS("",1) diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in index 3af0ad9c..b001d143 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in @@ -67,3 +67,7 @@ FORCE_STATIC_LIB = 1 FORCE_USE_PIC = 1 include $(topsrcdir)/config/rules.mk + +# See https://bugzilla.mozilla.org/show_bug.cgi?id=741348#c11 +# (diff copied from https://bug741348.bugzilla.mozilla.org/attachment.cgi?id=623623 - @dmitris) +file_id.$(OBJ_SUFFIX): STL_FLAGS= diff --git a/xpcom/build/nsXPCOMPrivate.h b/xpcom/build/nsXPCOMPrivate.h index e8c93949..54bebf9a 100644 --- a/xpcom/build/nsXPCOMPrivate.h +++ b/xpcom/build/nsXPCOMPrivate.h @@ -249,15 +249,15 @@ void LogTerm(); #define XPCOM_SEARCH_KEY "PATH" #define GRE_CONF_NAME "gre.config" #define GRE_WIN_REG_LOC L"Software\\mozilla.org\\GRE" -#define XPCOM_DLL "xpcom.dll" +#define XPCOM_DLL " xpcom.dll " #define LXPCOM_DLL L"xpcom.dll" -#define XUL_DLL "xul.dll" +#define XUL_DLL "xul.dll " #define LXUL_DLL L"xul.dll" #else // Unix #include // for PATH_MAX -#define XPCOM_DLL "libxpcom"MOZ_DLL_SUFFIX +#define XPCOM_DLL "libxpcom" MOZ_DLL_SUFFIX // you have to love apple.. #ifdef XP_MACOSX @@ -266,7 +266,7 @@ void LogTerm(); #define XUL_DLL "XUL" #else #define XPCOM_SEARCH_KEY "LD_LIBRARY_PATH" -#define XUL_DLL "libxul"MOZ_DLL_SUFFIX +#define XUL_DLL "libxul" MOZ_DLL_SUFFIX #endif #define GRE_CONF_NAME ".gre.config" diff --git a/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp b/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp index 23f8c89f..24ee7c17 100644 --- a/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp +++ b/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp @@ -228,7 +228,7 @@ XPCOMGlueLoad(const char *xpcomFile, GetFrozenFunctionsFunc *func) XPCOMGlueLoadDependentLibs(xpcomDir, ReadDependentCB); - snprintf(lastSlash, MAXPATHLEN - strlen(xpcomDir), "/" XUL_DLL); + snprintf(lastSlash, MAXPATHLEN - strlen(xpcomDir), " /" XUL_DLL); sXULLibHandle = dlopen(xpcomDir, RTLD_GLOBAL | RTLD_LAZY); From 625575fd73ed88be05f0b047b2ca952eca29ed96 Mon Sep 17 00:00:00 2001 From: Dmitry Savintsev Date: Fri, 15 Feb 2013 16:33:40 +0100 Subject: [PATCH 2/7] fixed comment style in secmodt.h --- security/nss/lib/softoken/secmodt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/nss/lib/softoken/secmodt.h b/security/nss/lib/softoken/secmodt.h index 96afe52c..882eadf7 100644 --- a/security/nss/lib/softoken/secmodt.h +++ b/security/nss/lib/softoken/secmodt.h @@ -337,7 +337,7 @@ typedef PRUint32 PK11AttrFlags; /* default module configuration strings */ #define SECMOD_SLOT_FLAGS "slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512]" -// https://bugzilla.mozilla.org/show_bug.cgi?id=698264 - dmitris +/* https://bugzilla.mozilla.org/show_bug.cgi?id=698264 - dmitris */ #define SECMOD_MAKE_NSS_FLAGS(fips,slot) \ "Flags=internal,critical" fips" slotparams=("#slot"={" SECMOD_SLOT_FLAGS"})" From a1e5a367f4a1d16ecd80f7051d917883b7bb2b8c Mon Sep 17 00:00:00 2001 From: Dmitry Savintsev Date: Fri, 15 Feb 2013 18:23:18 +0100 Subject: [PATCH 3/7] reverted unnecessary changes - compiles fines without them (issue #7) --- xpcom/glue/standalone/nsGlueLinkingDlopen.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp b/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp index 24ee7c17..23f8c89f 100644 --- a/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp +++ b/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp @@ -228,7 +228,7 @@ XPCOMGlueLoad(const char *xpcomFile, GetFrozenFunctionsFunc *func) XPCOMGlueLoadDependentLibs(xpcomDir, ReadDependentCB); - snprintf(lastSlash, MAXPATHLEN - strlen(xpcomDir), " /" XUL_DLL); + snprintf(lastSlash, MAXPATHLEN - strlen(xpcomDir), "/" XUL_DLL); sXULLibHandle = dlopen(xpcomDir, RTLD_GLOBAL | RTLD_LAZY); From ad1a08f07886ed478ca847fab19c6b8951361aa4 Mon Sep 17 00:00:00 2001 From: Dmitry Savintsev Date: Fri, 15 Feb 2013 18:31:01 +0100 Subject: [PATCH 4/7] reverted the previous change - the spaces are fine here (issue #7) --- xpcom/build/nsXPCOMPrivate.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xpcom/build/nsXPCOMPrivate.h b/xpcom/build/nsXPCOMPrivate.h index 54bebf9a..e3fb8c55 100644 --- a/xpcom/build/nsXPCOMPrivate.h +++ b/xpcom/build/nsXPCOMPrivate.h @@ -249,7 +249,7 @@ void LogTerm(); #define XPCOM_SEARCH_KEY "PATH" #define GRE_CONF_NAME "gre.config" #define GRE_WIN_REG_LOC L"Software\\mozilla.org\\GRE" -#define XPCOM_DLL " xpcom.dll " +#define XPCOM_DLL "xpcom.dll" #define LXPCOM_DLL L"xpcom.dll" #define XUL_DLL "xul.dll " #define LXUL_DLL L"xul.dll" From bb200394ba50580c4461e132dfae3610a780b026 Mon Sep 17 00:00:00 2001 From: Dmitry Savintsev Date: Fri, 15 Feb 2013 18:34:47 +0100 Subject: [PATCH 5/7] reverted the previous change - one more space that is not needed (issue #7) --- xpcom/build/nsXPCOMPrivate.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xpcom/build/nsXPCOMPrivate.h b/xpcom/build/nsXPCOMPrivate.h index e3fb8c55..a0739dd4 100644 --- a/xpcom/build/nsXPCOMPrivate.h +++ b/xpcom/build/nsXPCOMPrivate.h @@ -251,7 +251,7 @@ void LogTerm(); #define GRE_WIN_REG_LOC L"Software\\mozilla.org\\GRE" #define XPCOM_DLL "xpcom.dll" #define LXPCOM_DLL L"xpcom.dll" -#define XUL_DLL "xul.dll " +#define XUL_DLL "xul.dll" #define LXUL_DLL L"xul.dll" #else // Unix From 8e2cf415bb3b1616f3f0cbe4a8d40d87ee137398 Mon Sep 17 00:00:00 2001 From: Dmitry Savintsev Date: Fri, 15 Feb 2013 19:24:33 +0100 Subject: [PATCH 6/7] added conditional compilation guards for unistd.h (ifndef OS_WIN) (issue #7) --- ipc/chromium/src/base/file_util.cc | 9 ++++----- ipc/chromium/src/base/file_util_linux.cc | 2 ++ ipc/chromium/src/base/message_pump_libevent.cc | 5 ++++- ipc/chromium/src/base/time_posix.cc | 2 ++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ipc/chromium/src/base/file_util.cc b/ipc/chromium/src/base/file_util.cc index 48a36065..c698274d 100644 --- a/ipc/chromium/src/base/file_util.cc +++ b/ipc/chromium/src/base/file_util.cc @@ -6,13 +6,12 @@ #if defined(OS_WIN) #include +// commented out #if defined(ANDROID) to prevent the compile error +// due to undefine ftrunctate on Linux +#else +#include #endif #include -// /home/dsavints/dev/hack/dominator/ipc/chromium/src/base/file_util.cc (D.S.) -// commented out #if defined(ANDROID) to prevent the compile error due to undefine ftrunctate -//#if defined(ANDROID) -#include -//#endif #include diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc index 55be87d8..b0a77b30 100644 --- a/ipc/chromium/src/base/file_util_linux.cc +++ b/ipc/chromium/src/base/file_util_linux.cc @@ -5,8 +5,10 @@ #include "base/file_util.h" #include +#ifndef OS_WIN // https://bugzilla.mozilla.org/show_bug.cgi?id=736765 - added unistd.h to avoid compile error (DS) #include +#endif #include #include diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc index dd9e2836..cbee5219 100644 --- a/ipc/chromium/src/base/message_pump_libevent.cc +++ b/ipc/chromium/src/base/message_pump_libevent.cc @@ -6,8 +6,11 @@ #include #include -// https://bugzilla.mozilla.org/show_bug.cgi?id=746526 - added unistd.h to avoid compile error (D.S.) +#ifndef OS_WIN +// https://bugzilla.mozilla.org/show_bug.cgi?id=746526 - added unistd.h +// to avoid compile error on Linux #include +#endif #include "eintr_wrapper.h" #include "base/logging.h" diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc index 2638896f..450f4f91 100644 --- a/ipc/chromium/src/base/time_posix.cc +++ b/ipc/chromium/src/base/time_posix.cc @@ -3,7 +3,9 @@ // found in the LICENSE file. #include "base/time.h" +#ifndef OS_WIN #include +#endif #ifdef OS_MACOSX #include From 3abacc591916ce4cbfa492a1bdfac8dc9b2a8190 Mon Sep 17 00:00:00 2001 From: Dmitry Savintsev Date: Fri, 15 Feb 2013 19:50:18 +0100 Subject: [PATCH 7/7] added standard style conditional compilation guards for unistd.h (ifndef OS_WIN) (issue #7) --- ipc/chromium/src/base/file_util.cc | 7 +++---- ipc/chromium/src/base/file_util_linux.cc | 3 +-- ipc/chromium/src/base/message_pump_libevent.cc | 4 +--- ipc/chromium/src/base/time_posix.cc | 7 ++++--- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/ipc/chromium/src/base/file_util.cc b/ipc/chromium/src/base/file_util.cc index c698274d..6067a4ad 100644 --- a/ipc/chromium/src/base/file_util.cc +++ b/ipc/chromium/src/base/file_util.cc @@ -6,12 +6,11 @@ #if defined(OS_WIN) #include -// commented out #if defined(ANDROID) to prevent the compile error -// due to undefine ftrunctate on Linux -#else -#include #endif #include +#if defined(ANDROID) || defined(OS_POSIX) +#include +#endif #include diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc index b0a77b30..171e44f8 100644 --- a/ipc/chromium/src/base/file_util_linux.cc +++ b/ipc/chromium/src/base/file_util_linux.cc @@ -5,8 +5,7 @@ #include "base/file_util.h" #include -#ifndef OS_WIN -// https://bugzilla.mozilla.org/show_bug.cgi?id=736765 - added unistd.h to avoid compile error (DS) +#if defined(ANDROID) || defined(OS_POSIX) #include #endif diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc index cbee5219..c497a27a 100644 --- a/ipc/chromium/src/base/message_pump_libevent.cc +++ b/ipc/chromium/src/base/message_pump_libevent.cc @@ -6,9 +6,7 @@ #include #include -#ifndef OS_WIN -// https://bugzilla.mozilla.org/show_bug.cgi?id=746526 - added unistd.h -// to avoid compile error on Linux +#if defined(ANDROID) || defined(OS_POSIX) #include #endif diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc index 450f4f91..159700fb 100644 --- a/ipc/chromium/src/base/time_posix.cc +++ b/ipc/chromium/src/base/time_posix.cc @@ -3,9 +3,6 @@ // found in the LICENSE file. #include "base/time.h" -#ifndef OS_WIN -#include -#endif #ifdef OS_MACOSX #include @@ -17,6 +14,10 @@ #include #endif +#if defined(ANDROID) || defined(OS_POSIX) +#include +#endif + #include #include "base/basictypes.h"