Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base: master
...
compare: master
Checking mergeability… Don’t worry, you can still create the pull request.
  • 7 commits
  • 7 files changed
  • 4 commit comments
  • 1 contributor
View
2  ipc/chromium/src/base/file_util.cc
@@ -8,7 +8,7 @@
#include <io.h>
#endif
#include <stdio.h>
-#if defined(ANDROID)
+#if defined(ANDROID) || defined(OS_POSIX)
#include <unistd.h>
#endif
View
3  ipc/chromium/src/base/file_util_linux.cc
@@ -5,6 +5,9 @@
#include "base/file_util.h"
#include <fcntl.h>
+#if defined(ANDROID) || defined(OS_POSIX)
+#include <unistd.h>
+#endif
#include <string>
#include <vector>
View
3  ipc/chromium/src/base/message_pump_libevent.cc
@@ -6,6 +6,9 @@
#include <errno.h>
#include <fcntl.h>
+#if defined(ANDROID) || defined(OS_POSIX)
+#include <unistd.h>
+#endif
#include "eintr_wrapper.h"
#include "base/logging.h"
View
4 ipc/chromium/src/base/time_posix.cc
@@ -14,6 +14,10 @@
#include <time.h>
#endif
+#if defined(ANDROID) || defined(OS_POSIX)
+#include <unistd.h>
+#endif
+
#include <limits>
#include "base/basictypes.h"
View
3  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)
View
4 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=
View
4 xpcom/build/nsXPCOMPrivate.h
@@ -257,7 +257,7 @@ void LogTerm();
#else // Unix
#include <limits.h> // 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"

Showing you all comments on commits in this comparison.

@wisec
Owner

is this from a mozilla issue? it seems wrong to me,please, compare it with the latest version:
https://github.com/mozilla/mozilla-central/blob/master/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp

@wisec
Owner

Are you sure? does not seem ok to me:https://github.com/mozilla/mozilla-central/blob/master/xpcom/build/nsXPCOMPrivate.h
same othe similar lines below

@dmitris
Collaborator

yes, you are right - this is unnecessary. Reverted.

@dmitris
Collaborator

removed spaces - not needed and do not preclude compiling with gcc-4.7

Something went wrong with that request. Please try again.