Backout changeset 9c78c5ac85a8 (bug 907683) for Android bustage

Backout changeset 9c78c5ac85a8 (bug 907683) for Android bustage

     1.1 --- a/ipc/app/MozillaRuntimeMain.cpp      1.2 +++ b/ipc/app/MozillaRuntimeMain.cpp      1.3 @@ -3,17 +3,17 @@      1.4   * This Source Code Form is subject to the terms of the Mozilla Public      1.5   * License, v. 2.0. If a copy of the MPL was not distributed with this      1.6   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */      1.7        1.8  #include "nsXPCOM.h"      1.9  #include "nsXULAppAPI.h"     1.10       1.11  // FIXME/cjones testing     1.12 -#if !defined(XP_WIN)     1.13 +#if !defined(OS_WIN)     1.14  #include <unistd.h>     1.15  #endif     1.16       1.17  #ifdef XP_WIN     1.18  #include <windows.h>     1.19  // we want a wmain entry point     1.20  // but we don't want its DLL load protection, because we'll handle it here     1.21  #define XRE_DONT_PROTECT_DLL_LOAD 

     2.1 --- a/ipc/chromium/chromium-config.mk      2.2 +++ b/ipc/chromium/chromium-config.mk      2.3 @@ -18,36 +18,101 @@ LOCAL_INCLUDES += \      2.4    -I$(topsrcdir)/ipc/chromium/src \      2.5    -I$(topsrcdir)/ipc/glue \      2.6    -I$(DEPTH)/ipc/ipdl/_ipdlheaders \      2.7    $(NULL)      2.8        2.9  ifeq ($(OS_ARCH),WINNT) # {     2.10  OS_LIBS += $(call EXPAND_LIBNAME,psapi shell32 dbghelp)     2.11       2.12 +OS_WIN = 1     2.13 +     2.14  DEFINES += \     2.15    -DUNICODE \     2.16    -D_UNICODE \     2.17    -DNOMINMAX \     2.18    -D_CRT_RAND_S \     2.19    -DCERT_CHAIN_PARA_HAS_EXTRA_FIELDS \     2.20    -D_SECURE_ATL \     2.21    -DCHROMIUM_BUILD \     2.22    -DU_STATIC_IMPLEMENTATION \     2.23 +  -DOS_WIN=1 \     2.24    -DWIN32 \     2.25    -D_WIN32 \     2.26    -D_WINDOWS \     2.27    -DWIN32_LEAN_AND_MEAN \     2.28    $(NULL)     2.29       2.30  ifdef _MSC_VER     2.31  DEFINES += -DCOMPILER_MSVC     2.32  endif     2.33       2.34  else # } {     2.35 +OS_POSIX = 1     2.36 +DEFINES += -DOS_POSIX=1     2.37       2.38 -ifneq (,$(filter $(OS_ARCH),FreeBSD DragonFly NetBSD OpenBSD)) # {     2.39 +ifeq ($(OS_ARCH),Darwin) # {     2.40       2.41 +OS_MACOSX = 1     2.42 +DEFINES += \     2.43 +  -DOS_MACOSX=1 \     2.44 +  $(NULL)     2.45 +     2.46 +else # } {     2.47 +ifeq ($(OS_ARCH),DragonFly) # {     2.48 +     2.49 +OS_DRAGONFLY = 1     2.50 +OS_BSD = 1     2.51  OS_LIBS += $(call EXPAND_LIBNAME,kvm)     2.52 +DEFINES += \     2.53 +  -DOS_DRAGONFLY=1 \     2.54 +  -DOS_BSD=1 \     2.55 +  $(NULL)     2.56 +     2.57 +else # } {     2.58 +ifneq (,$(filter $(OS_ARCH),FreeBSD GNU_kFreeBSD)) # {     2.59 +     2.60 +OS_FREEBSD = 1     2.61 +OS_BSD = 1     2.62 +ifneq ($(OS_ARCH),GNU_kFreeBSD)     2.63 +OS_LIBS += $(call EXPAND_LIBNAME,kvm)     2.64 +endif     2.65 +DEFINES += \     2.66 +  -DOS_FREEBSD=1 \     2.67 +  -DOS_BSD=1 \     2.68 +  $(NULL)     2.69 +     2.70 +else # } {     2.71 +ifeq ($(OS_ARCH),NetBSD) # {     2.72 +     2.73 +OS_NETBSD = 1     2.74 +OS_BSD = 1     2.75 +OS_LIBS += $(call EXPAND_LIBNAME,kvm)     2.76 +DEFINES += \     2.77 +  -DOS_NETBSD=1 \     2.78 +  -DOS_BSD=1 \     2.79 +  $(NULL)     2.80 +     2.81 +else # } {     2.82 +ifeq ($(OS_ARCH),OpenBSD) # {     2.83 +     2.84 +OS_OPENBSD = 1     2.85 +OS_BSD = 1     2.86 +OS_LIBS += $(call EXPAND_LIBNAME,kvm)     2.87 +DEFINES += \     2.88 +  -DOS_OPENBSD=1 \     2.89 +  -DOS_BSD=1 \     2.90 +  $(NULL)     2.91 +     2.92 +else # } {     2.93 +     2.94 +OS_LINUX = 1     2.95 +DEFINES += \     2.96 +  -DOS_LINUX=1 \     2.97 +  $(NULL)     2.98       2.99  endif # }    2.100  endif # }    2.101 +endif # }    2.102 +endif # }    2.103 +endif # }    2.104 +endif # }    2.105   

Source: http://hg.mozilla.org/integration/mozilla-inbound/rev/bb7959840ea5

temptations work hard play hard tim ferriss wmt human nature arkansas football howard johnson