Bug 1175049 - Fix non-universal 32-bit build on OS X with Xcode 6.3 tools. r=josh
authorChris Peterson <cpeterson@mozilla.com>
Sun, 14 Jun 2015 00:20:27 -0700
changeset 280682 2f18c8a4deb4dca6fc13ea01941f5e292cbfb456
parent 280681 8a25cd69c4aef0e73390ea704b0752cae5a81b78
child 280683 0757793dc988fdcc5e7a61c1ad839492252e52ef
push id4932
push userjlund@mozilla.com
push dateMon, 10 Aug 2015 18:23:06 +0000
treeherdermozilla-beta@6dd5a4f5f745 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjosh
bugs1175049
milestone41.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1175049 - Fix non-universal 32-bit build on OS X with Xcode 6.3 tools. r=josh
widget/cocoa/nsChildView.mm
xpcom/build/PoisonIOInterposerMac.cpp
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -237,37 +237,16 @@ static uint32_t gNumberOfWidgetsNeedingE
   CGSRegionObj region;
   CGSNewRegionWithRect(&rect, &region);
   return region;
 }
 @end
 
 #pragma mark -
 
-/* Convenience routine to go from a Gecko rect to Cocoa NSRect.
- *
- * Gecko rects (nsRect) contain an origin (x,y) in a coordinate
- * system with (0,0) in the top-left of the screen. Cocoa rects
- * (NSRect) contain an origin (x,y) in a coordinate system with
- * (0,0) in the bottom-left of the screen. Both nsRect and NSRect
- * contain width/height info, with no difference in their use.
- * If a Cocoa rect is from a flipped view, there is no need to
- * convert coordinate systems.
- */
-#ifndef __LP64__
-static inline void
-ConvertGeckoRectToMacRect(const nsIntRect& aRect, Rect& outMacRect)
-{
-  outMacRect.left = aRect.x;
-  outMacRect.top = aRect.y;
-  outMacRect.right = aRect.x + aRect.width;
-  outMacRect.bottom = aRect.y + aRect.height;
-}
-#endif
-
 // Flips a screen coordinate from a point in the cocoa coordinate system (bottom-left rect) to a point
 // that is a "flipped" cocoa coordinate system (starts in the top-left).
 static inline void
 FlipCocoaScreenCoordinate(NSPoint &inPoint)
 {
   inPoint.y = nsCocoaUtils::FlippedScreenY(inPoint.y);
 }
 
--- a/xpcom/build/PoisonIOInterposerMac.cpp
+++ b/xpcom/build/PoisonIOInterposerMac.cpp
@@ -26,16 +26,17 @@
 
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
 #include <aio.h>
 #include <dlfcn.h>
 #include <fcntl.h>
+#include <unistd.h>
 
 #ifdef MOZ_REPLACE_MALLOC
 #include "replace_malloc_bridge.h"
 #endif
 
 namespace {
 
 using namespace mozilla;