Merge m-c to b-s.

This commit is contained in:
Kyle Huey 2011-10-28 09:27:32 -04:00
commit 41028ec823
2 changed files with 4 additions and 2 deletions

View File

@ -15,7 +15,7 @@ if sys.platform=='win32':
_log = logging.getLogger('pymake.process')
_escapednewlines = re.compile(r'\\\n')
_blacklist = re.compile(r'[$><;[{~`|&]')
_blacklist = re.compile(r'[$><;[{~`|&()]')
_needsglob = re.compile(r'[\*\?]')
def clinetoargv(cline):
"""

View File

@ -41,7 +41,9 @@
#ifndef mozilla_${HEADER}_h
#define mozilla_${HEADER}_h
#if __EXCEPTIONS
// For some reason, Apple's GCC refuses to honor -fno-exceptions when
// compiling ObjC.
#if __EXCEPTIONS && !(__OBJC__ && __GNUC__ && XP_IOS)
# error "STL code can only be used with -fno-exceptions"
#endif