Changes to base/ from a combination of FreeBSD and OpenBSD patches.

base/gfx/rect.cc

Index: base/gfx/rect.cc
diff --git a/base/gfx/rect.cc b/base/gfx/rect.cc
index 2a355756749208fcede1c19c6977ac911ae1f428..961fa039e962cad12a2339194fcfbaca5d01c302 100644
--- a/base/gfx/rect.cc
+++ b/base/gfx/rect.cc
@@ -8,7 +8,7 @@
 #include <windows.h>
 #elif defined(OS_MACOSX)
 #include <CoreGraphics/CGGeometry.h>
-#elif defined(OS_LINUX)
+#elif defined(OS_POSIX)
 #include <gdk/gdk.h>
 #endif
 
@@ -76,7 +76,7 @@ Rect& Rect::operator=(const CGRect& r) {
   set_height(r.size.height);
   return *this;
 }
-#elif defined(OS_LINUX)
+#elif defined(OS_POSIX)
 Rect::Rect(const GdkRectangle& r)
     : origin_(r.x, r.y) {
   set_width(r.width);
@@ -128,15 +128,15 @@ RECT Rect::ToRECT() const {
   r.bottom = bottom();
   return r;
 }
-#elif defined(OS_LINUX)
-GdkRectangle Rect::ToGdkRectangle() const {
-  GdkRectangle r = {x(), y(), width(), height()};
-  return r;
-}
 #elif defined(OS_MACOSX)
 CGRect Rect::ToCGRect() const {
   return CGRectMake(x(), y(), width(), height());
 }
+#elif defined(OS_POSIX)
+GdkRectangle Rect::ToGdkRectangle() const {
+  GdkRectangle r = {x(), y(), width(), height()};
+  return r;
+}
 #endif
 
 bool Rect::Contains(int point_x, int point_y) const {