diff --git a/mozilla/cmd/macfe/Composer/build/Composer.mcp b/mozilla/cmd/macfe/Composer/build/Composer.mcp index c58d4bb8c30..d4633c56c46 100644 Binary files a/mozilla/cmd/macfe/Composer/build/Composer.mcp and b/mozilla/cmd/macfe/Composer/build/Composer.mcp differ diff --git a/mozilla/cmd/macfe/Composer/build/Composer_DebugPrefix.h b/mozilla/cmd/macfe/Composer/build/Composer_DebugPrefix.h index 4925b407916..6dc5d424c42 100644 --- a/mozilla/cmd/macfe/Composer/build/Composer_DebugPrefix.h +++ b/mozilla/cmd/macfe/Composer/build/Composer_DebugPrefix.h @@ -23,7 +23,7 @@ // You typically won't need to change anything in this file. // ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ -#include "Moz_DebugConfig.h" +#include "MacPrefix_debug.h" // ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ // ₯ When we split out the procompiled headers seperately, we will not diff --git a/mozilla/cmd/macfe/Composer/build/Composer_Headers.pch b/mozilla/cmd/macfe/Composer/build/Composer_Headers.pch index 2a842720ee9..412b1a39f9c 100644 --- a/mozilla/cmd/macfe/Composer/build/Composer_Headers.pch +++ b/mozilla/cmd/macfe/Composer/build/Composer_Headers.pch @@ -30,7 +30,7 @@ // // ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ -#include "Moz_Config.h" +#include "MacPrefix.h" #ifdef powerc #pragma precompile_target "Composer_HeadersPPC" diff --git a/mozilla/cmd/macfe/Composer/build/Composer_Headers.pch++ b/mozilla/cmd/macfe/Composer/build/Composer_Headers.pch++ index 314edfd4282..b25e3479053 100644 --- a/mozilla/cmd/macfe/Composer/build/Composer_Headers.pch++ +++ b/mozilla/cmd/macfe/Composer/build/Composer_Headers.pch++ @@ -31,7 +31,7 @@ // // ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ -#include "Moz_Config.h" +#include "MacPrefix.h" #ifdef powerc #pragma precompile_target "Composer_HeadersPPC++" diff --git a/mozilla/cmd/macfe/Composer/build/Composer_Prefix.h b/mozilla/cmd/macfe/Composer/build/Composer_Prefix.h index bedf03f03e1..bd58561ce27 100644 --- a/mozilla/cmd/macfe/Composer/build/Composer_Prefix.h +++ b/mozilla/cmd/macfe/Composer/build/Composer_Prefix.h @@ -23,7 +23,7 @@ // You typically won't need to change anything in this file. // ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ -#include "Moz_Config.h" +#include "MacPrefix.h" // ΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡΡ // ₯ When we split out the procompiled headers seperately, we will not diff --git a/mozilla/modules/libfont/macbuild/FontBroker.mcp b/mozilla/modules/libfont/macbuild/FontBroker.mcp index ed34a384564..e7e3cf7e49e 100644 Binary files a/mozilla/modules/libfont/macbuild/FontBroker.mcp and b/mozilla/modules/libfont/macbuild/FontBroker.mcp differ diff --git a/mozilla/modules/libfont/macbuild/FontBroker.prefix b/mozilla/modules/libfont/macbuild/FontBroker.prefix index 64e1f728183..f004562ef35 100644 --- a/mozilla/modules/libfont/macbuild/FontBroker.prefix +++ b/mozilla/modules/libfont/macbuild/FontBroker.prefix @@ -1,7 +1,19 @@ -#define MOZILLA_CLIENT 1 -#define MOCHA 1 -#define EDITOR 1 -#define LAYERS 1 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All Rights + * Reserved. + */ -#include "IDE_Options.h" -#include "NSCrossProductDefines.h" +#include "MacPrefix.h" diff --git a/mozilla/modules/libfont/macbuild/FontBrokerDebug.prefix b/mozilla/modules/libfont/macbuild/FontBrokerDebug.prefix index fd6c021a838..e5eda421547 100644 --- a/mozilla/modules/libfont/macbuild/FontBrokerDebug.prefix +++ b/mozilla/modules/libfont/macbuild/FontBrokerDebug.prefix @@ -1,4 +1,19 @@ -#define DEBUG 1 -#define TRACING 1 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All Rights + * Reserved. + */ -#include "FontBroker.prefix" +#include "MacPrefix_debug.h" diff --git a/mozilla/modules/schedulr/macbuild/Schedulr.mcp b/mozilla/modules/schedulr/macbuild/Schedulr.mcp index f39089bc010..c66242bce7e 100644 Binary files a/mozilla/modules/schedulr/macbuild/Schedulr.mcp and b/mozilla/modules/schedulr/macbuild/Schedulr.mcp differ diff --git a/mozilla/modules/xml/macbuild/XML.Prefix b/mozilla/modules/xml/macbuild/XML.Prefix index 50dd204e1ef..10055807386 100644 --- a/mozilla/modules/xml/macbuild/XML.Prefix +++ b/mozilla/modules/xml/macbuild/XML.Prefix @@ -23,4 +23,5 @@ // // -#include \ No newline at end of file +#include "MacPrefix.h" +#include "XMLConfig.h" diff --git a/mozilla/modules/xml/macbuild/XML.mcp b/mozilla/modules/xml/macbuild/XML.mcp index 28ec3d22451..390e4542ab9 100644 Binary files a/mozilla/modules/xml/macbuild/XML.mcp and b/mozilla/modules/xml/macbuild/XML.mcp differ diff --git a/mozilla/modules/xml/macbuild/XMLDebug.Prefix b/mozilla/modules/xml/macbuild/XMLDebug.Prefix index afcc0e570dd..bc1a17ba01c 100644 --- a/mozilla/modules/xml/macbuild/XMLDebug.Prefix +++ b/mozilla/modules/xml/macbuild/XMLDebug.Prefix @@ -23,6 +23,5 @@ // // -#define DEBUG 1 -#define DEVELOPER_DEBUG 1 -#include \ No newline at end of file +#include "MacPrefix_debug.h" +#include "XMLConfig.h" diff --git a/mozilla/network/macbuild/network.mcp b/mozilla/network/macbuild/network.mcp index 46d4822106a..33a52c9d85c 100644 Binary files a/mozilla/network/macbuild/network.mcp and b/mozilla/network/macbuild/network.mcp differ