From f6eb63ca1192501870216b6e00c8ee93ab60d475 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Fri, 6 Sep 2013 09:12:43 +0900
Subject: [PATCH] Bug 907683 - Cleanup ipc/chromium/chromium-config.mk.
 r=bsmedberg

---
 ipc/app/MozillaRuntimeMain.cpp  |  2 +-
 ipc/chromium/chromium-config.mk | 67 +--------------------------------
 2 files changed, 2 insertions(+), 67 deletions(-)

diff --git a/ipc/app/MozillaRuntimeMain.cpp b/ipc/app/MozillaRuntimeMain.cpp
index ef4d6f7f2206..637684651184 100644
--- a/ipc/app/MozillaRuntimeMain.cpp
+++ b/ipc/app/MozillaRuntimeMain.cpp
@@ -8,7 +8,7 @@
 #include "nsXULAppAPI.h"
 
 // FIXME/cjones testing
-#if !defined(OS_WIN)
+#if !defined(XP_WIN)
 #include <unistd.h>
 #endif
 
diff --git a/ipc/chromium/chromium-config.mk b/ipc/chromium/chromium-config.mk
index 46af9d7b2a08..8b64966abfb9 100644
--- a/ipc/chromium/chromium-config.mk
+++ b/ipc/chromium/chromium-config.mk
@@ -23,8 +23,6 @@ LOCAL_INCLUDES += \
 ifeq ($(OS_ARCH),WINNT) # {
 OS_LIBS += $(call EXPAND_LIBNAME,psapi shell32 dbghelp)
 
-OS_WIN = 1
-
 DEFINES += \
   -DUNICODE \
   -D_UNICODE \
@@ -34,7 +32,6 @@ DEFINES += \
   -D_SECURE_ATL \
   -DCHROMIUM_BUILD \
   -DU_STATIC_IMPLEMENTATION \
-  -DOS_WIN=1 \
   -DWIN32 \
   -D_WIN32 \
   -D_WINDOWS \
@@ -46,73 +43,11 @@ DEFINES += -DCOMPILER_MSVC
 endif
 
 else # } {
-OS_POSIX = 1
-DEFINES += -DOS_POSIX=1
 
-ifeq ($(OS_ARCH),Darwin) # {
+ifneq (,$(filter $(OS_ARCH),FreeBSD DragonFly NetBSD OpenBSD)) # {
 
-OS_MACOSX = 1
-DEFINES += \
-  -DOS_MACOSX=1 \
-  $(NULL)
-
-else # } {
-ifeq ($(OS_ARCH),DragonFly) # {
-
-OS_DRAGONFLY = 1
-OS_BSD = 1
 OS_LIBS += $(call EXPAND_LIBNAME,kvm)
-DEFINES += \
-  -DOS_DRAGONFLY=1 \
-  -DOS_BSD=1 \
-  $(NULL)
-
-else # } {
-ifneq (,$(filter $(OS_ARCH),FreeBSD GNU_kFreeBSD)) # {
-
-OS_FREEBSD = 1
-OS_BSD = 1
-ifneq ($(OS_ARCH),GNU_kFreeBSD)
-OS_LIBS += $(call EXPAND_LIBNAME,kvm)
-endif
-DEFINES += \
-  -DOS_FREEBSD=1 \
-  -DOS_BSD=1 \
-  $(NULL)
-
-else # } {
-ifeq ($(OS_ARCH),NetBSD) # {
-
-OS_NETBSD = 1
-OS_BSD = 1
-OS_LIBS += $(call EXPAND_LIBNAME,kvm)
-DEFINES += \
-  -DOS_NETBSD=1 \
-  -DOS_BSD=1 \
-  $(NULL)
-
-else # } {
-ifeq ($(OS_ARCH),OpenBSD) # {
-
-OS_OPENBSD = 1
-OS_BSD = 1
-OS_LIBS += $(call EXPAND_LIBNAME,kvm)
-DEFINES += \
-  -DOS_OPENBSD=1 \
-  -DOS_BSD=1 \
-  $(NULL)
-
-else # } {
-
-OS_LINUX = 1
-DEFINES += \
-  -DOS_LINUX=1 \
-  $(NULL)
 
 endif # }
 endif # }
-endif # }
-endif # }
-endif # }
-endif # }