Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fixes for gcc-4.7 #8

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

fixes for gcc-4.7 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5925ac3
miscellaneous fixes (merged from later Firefox issues) to make it com…
Feb 15, 2013
625575f
fixed comment style in secmodt.h
Feb 15, 2013
a1e5a36
reverted unnecessary changes - compiles fines without them (issue #7)
Feb 15, 2013
ad1a08f
reverted the previous change - the spaces are fine here (issue #7)
Feb 15, 2013
bb20039
reverted the previous change - one more space that is not needed (iss…
Feb 15, 2013
8e2cf41
added conditional compilation guards for unistd.h (ifndef OS_WIN) (is…
Feb 15, 2013
3abacc5
added standard style conditional compilation guards for unistd.h (ifn…
Feb 15, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ipc/chromium/src/base/file_util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <io.h>
#endif
#include <stdio.h>
#if defined(ANDROID)
#if defined(ANDROID) || defined(OS_POSIX)
#include <unistd.h>
#endif

Expand Down
3 changes: 3 additions & 0 deletions ipc/chromium/src/base/file_util_linux.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions ipc/chromium/src/base/message_pump_libevent.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions ipc/chromium/src/base/time_posix.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
#include <time.h>
#endif

#if defined(ANDROID) || defined(OS_POSIX)
#include <unistd.h>
#endif

#include <limits>

#include "base/basictypes.h"
Expand Down
3 changes: 2 additions & 1 deletion security/nss/lib/softoken/secmodt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
4 changes: 2 additions & 2 deletions xpcom/build/nsXPCOMPrivate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down