From 90e3ef9e19fb9e5b2107efced09df219cb8c5e5b Mon Sep 17 00:00:00 2001 From: "sdagley%netscape.com" Date: Sat, 29 Jan 2000 04:16:36 +0000 Subject: [PATCH] Fixing Mac build bustage. For some unknown @#$%^ reason strdup was defined in the LibjarPrefix headers which was generally a bad idea. Moved the code to an #ifdef XP_MAC block in nsZipArchive.cpp so libjar.mcp _and_ MIW.mcp project build again. Why this ever worked I don't know, I just hacked at it until I could get it building again cause it's Friday night and I wanna go home. r=mstoltz --- modules/libjar/macbuild/LibjarPrefix.h | 40 -------------------- modules/libjar/macbuild/LibjarPrefix_debug.h | 40 -------------------- modules/libjar/nsZipArchive.cpp | 14 +++++++ 3 files changed, 14 insertions(+), 80 deletions(-) diff --git a/modules/libjar/macbuild/LibjarPrefix.h b/modules/libjar/macbuild/LibjarPrefix.h index 57de700cad1..e69de29bb2d 100644 --- a/modules/libjar/macbuild/LibjarPrefix.h +++ b/modules/libjar/macbuild/LibjarPrefix.h @@ -1,40 +0,0 @@ -/* -*- 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.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is Mozilla Communicator client code, - * released March 31, 1998. - * - * The Initial Developer of the Original Code is Netscape Communications - * Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * Samir Gehani - */ - - -#include "MacPrefix.h" - -#define STANDALONE 1 -#define XP_MAC 1 - -#include -#include -char * strdup(const char *src); -char * strdup(const char *src) -{ - long len = strlen(src); - char *dup = (char *)malloc(len+1 * sizeof(char)); - memcpy(dup, src, len+1); - return dup; -} \ No newline at end of file diff --git a/modules/libjar/macbuild/LibjarPrefix_debug.h b/modules/libjar/macbuild/LibjarPrefix_debug.h index 99b8782f397..e69de29bb2d 100644 --- a/modules/libjar/macbuild/LibjarPrefix_debug.h +++ b/modules/libjar/macbuild/LibjarPrefix_debug.h @@ -1,40 +0,0 @@ -/* -*- 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.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is Mozilla Communicator client code, - * released March 31, 1998. - * - * The Initial Developer of the Original Code is Netscape Communications - * Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * Samir Gehani - */ - - -#include "MacPrefix_debug.h" - -#define STANDALONE 1 -#define XP_MAC 1 - -#include -#include -char * strdup(const char *src); -char * strdup(const char *src) -{ - long len = strlen(src); - char *dup = (char *)malloc(len+1 * sizeof(char)); - memcpy(dup, src, len+1); - return dup; -} \ No newline at end of file diff --git a/modules/libjar/nsZipArchive.cpp b/modules/libjar/nsZipArchive.cpp index aa76b989a5b..ac85c94e607 100644 --- a/modules/libjar/nsZipArchive.cpp +++ b/modules/libjar/nsZipArchive.cpp @@ -57,6 +57,20 @@ #undef PR_PUBLIC_API #include "zipstub.h" +#ifdef XP_MAC +#include +#include + +char * strdup(const char *src); +char * strdup(const char *src) +{ + long len = strlen(src); + char *dup = (char *)malloc(len+1 * sizeof(char)); + memcpy(dup, src, len+1); + return dup; +} +#endif + #endif /* STANDALONE */ #ifdef XP_UNIX