From c349ae208e17e1cb8a142c8fb80d6a44abac9361 Mon Sep 17 00:00:00 2001 From: "seawood%netscape.com" Date: Fri, 4 Apr 2003 07:44:08 +0000 Subject: [PATCH] Purge obsolete mozilla/include Bug #199920 git-svn-id: svn://10.0.0.236/trunk@140685 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/include/MANIFEST | 5 -- mozilla/include/Makefile.in | 32 -------- mozilla/include/minicom.h | 143 ------------------------------------ mozilla/include/xp_mcom.h | 76 ------------------- mozilla/include/xp_path.h | 71 ------------------ mozilla/include/xp_str.h | 69 ----------------- 6 files changed, 396 deletions(-) delete mode 100644 mozilla/include/MANIFEST delete mode 100644 mozilla/include/Makefile.in delete mode 100644 mozilla/include/minicom.h delete mode 100644 mozilla/include/xp_mcom.h delete mode 100644 mozilla/include/xp_path.h delete mode 100644 mozilla/include/xp_str.h diff --git a/mozilla/include/MANIFEST b/mozilla/include/MANIFEST deleted file mode 100644 index 5d6c6e75e9d..00000000000 --- a/mozilla/include/MANIFEST +++ /dev/null @@ -1,5 +0,0 @@ -# -# This is a list of local files which get copied to the mozilla:dist directory -# - -xp_path.h diff --git a/mozilla/include/Makefile.in b/mozilla/include/Makefile.in deleted file mode 100644 index f8910127492..00000000000 --- a/mozilla/include/Makefile.in +++ /dev/null @@ -1,32 +0,0 @@ -# -# 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.org code. -# -# 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): -# - -DEPTH = .. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -EXPORTS = \ - xp_path.h \ - $(NULL) - -include $(topsrcdir)/config/rules.mk - diff --git a/mozilla/include/minicom.h b/mozilla/include/minicom.h deleted file mode 100644 index df9cc0f7fc7..00000000000 --- a/mozilla/include/minicom.h +++ /dev/null @@ -1,143 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * 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.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - - -/******************************************************************************* - * Mini Component Object Model - ******************************************************************************/ - -#ifndef MINICOM_H -#define MINICOM_H - -#ifdef __cplusplus -extern "C" { -#endif - -/******************************************************************************/ - -#if defined(XP_PC) && !defined(XP_OS2) -#if defined(_WIN32) -#include "objbase.h" -#else -#include -#include "compobj.h" -#endif -#else /* !XP_PC or XP_OS2*/ - -#if defined(XP_OS2) -#define TID OS2TID /* global rename in OS2 H's! */ -#include -#undef TID /* and restore */ -#endif - -typedef struct _GUID { - long Data1; - short Data2; - short Data3; - char Data4[8]; -} GUID; - -typedef GUID IID; -typedef GUID CLSID; - -typedef IID* REFIID; -typedef GUID* REFGUID; -typedef CLSID* REFCLSID; - -#ifdef __cplusplus -#define EXTERN_C extern "C" -#else -#define EXTERN_C -#endif /* cplusplus */ - -#ifndef INITGUID -#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - EXTERN_C const GUID name -#else -#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - EXTERN_C const GUID name \ - = { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } -#endif /* INITGUID */ - -#endif /* !XP_PC or XP_OS2*/ - -#define JRI_DEFINE_GUID(name, l, w1, w2) \ - DEFINE_GUID(name, l, w1, w2, \ - 0xbb, 0x58, 0x00, 0x80, 0x5f, 0x74, 0x03, 0x79) - -typedef long -(*MCOM_QueryInterface_t)(void* self, REFIID id, void* *result); - -typedef long -(*MCOM_AddRef_t)(void* self); - -typedef long -(*MCOM_Release_t)(void* self); - -#if !defined(XP_PC) || defined(XP_OS2) - -typedef struct IUnknown { - MCOM_QueryInterface_t QueryInterface; - MCOM_AddRef_t AddRef; - MCOM_Release_t Release; -} IUnknown; - -#define IUnknown_QueryInterface(self, interfaceID, resultingInterface) \ - (((*((IUnknown**)self))->QueryInterface)(self, interfaceID, resultingInterface)) - -#define IUnknown_AddRef(self) \ - (((*((IUnknown**)self))->AddRef)(self)) - -#define IUnknown_Release(self) \ - (((*((IUnknown**)self))->Release)(self)) - -#endif /* !XP_PC or XP_OS2*/ - -typedef long -(*MCOM_CreateInstance_t)(void* self, IUnknown* outer, REFIID interfaceID, - void** newInstance); - -typedef long -(*MCOM_LockServer_t)(void* self, int doLock); - -/******************************************************************************/ -#ifdef __cplusplus -} -#endif -#endif /* MINICOM_H */ -/******************************************************************************/ diff --git a/mozilla/include/xp_mcom.h b/mozilla/include/xp_mcom.h deleted file mode 100644 index 0ba2f220b47..00000000000 --- a/mozilla/include/xp_mcom.h +++ /dev/null @@ -1,76 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * 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.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -/* - * This file should be the first Mcom file included - * - * All cross-platform definitions, regardless of project, should be - * contained in this file or its includes - */ - -#ifndef _MCOM_H_ -#define _MCOM_H_ - -#include "prtypes.h" -#include - -#ifdef XP_MAC -PR_BEGIN_EXTERN_C - -extern char * strdup(const char *); -extern time_t GetTimeMac(); -extern time_t Mactime(time_t *timer); -extern struct tm *Macgmtime(const time_t *timer); -extern time_t Macmktime (struct tm *timeptr); -extern char * Macctime(const time_t *); -extern struct tm *Maclocaltime(const time_t *); - -PR_END_EXTERN_C - -#define XP_TIME() GetTimeMac() -#define time(t) Mactime(t) -#define gmtime(t) Macgmtime(t) -#define mktime(t) Macmktime(t) -#define ctime(t) Macctime(t) -#define localtime(t) Maclocaltime(t) -#define UNIXMINUSMACTIME 2082844800UL -#else -#define XP_TIME() time(0) -#endif - -#endif /* _MCOM_H_ */ diff --git a/mozilla/include/xp_path.h b/mozilla/include/xp_path.h deleted file mode 100644 index 9f763d2d37a..00000000000 --- a/mozilla/include/xp_path.h +++ /dev/null @@ -1,71 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * 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.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -/* - * The contents of this file used to be part of prosdep.h, - * a private NSPR header file of the NSPR module. The macros - * defined in this file are the only things the Mozilla - * client needs from prosdep.h, so I extracted them and put - * them in this new file. - * -- Wan-Teh Chang , 18 September 1998 - */ - -#ifndef _XP_PATH_H -#define _XP_PATH_H - -#if defined(XP_UNIX) || defined(XP_MAC) || defined(XP_BEOS) -#define PR_DIRECTORY_SEPARATOR '/' -#define PR_DIRECTORY_SEPARATOR_STR "/" -#define PR_PATH_SEPARATOR ':' -#define PR_PATH_SEPARATOR_STR ":" -#elif defined(XP_PC) /* Win32, Win16, and OS/2 */ -#define PR_DIRECTORY_SEPARATOR '\\' -#define PR_DIRECTORY_SEPARATOR_STR "\\" -#define PR_PATH_SEPARATOR ';' -#define PR_PATH_SEPARATOR_STR ";" -#else -#error "Unknown platform" -#endif - -#ifdef XP_MAC -#define PATH_SEPARATOR_STR ":" -#define DIRECTORY_SEPARATOR_STR "/" -#define MAXPATHLEN 512 -#endif - -#endif /* _XP_PATH_H */ diff --git a/mozilla/include/xp_str.h b/mozilla/include/xp_str.h deleted file mode 100644 index 6f00911173e..00000000000 --- a/mozilla/include/xp_str.h +++ /dev/null @@ -1,69 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * 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.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#ifndef XPSTRING_H -#define XPSTRING_H - -#include "prtypes.h" - -#define XP_IS_SPACE(VAL) \ - (((((intn)(VAL)) & 0x7f) == ((intn)(VAL))) && isspace((intn)(VAL)) ) - -#define XP_IS_CNTRL(i) ((((unsigned int) (i)) > 0x7f) ? (int) 0 : iscntrl(i)) -#define XP_IS_DIGIT(i) ((((unsigned int) (i)) > 0x7f) ? (int) 0 : isdigit(i)) -#ifdef XP_WIN -#define XP_IS_ALPHA(VAL) (isascii((int)(VAL)) && isalpha((int)(VAL))) -#else -#define XP_IS_ALPHA(VAL) ((((unsigned int) (VAL)) > 0x7f) ? FALSE : isalpha((int)(VAL))) -#endif - -#ifdef DEBUG - PR_BEGIN_EXTERN_C - extern char * NOT_NULL (const char *x); - PR_END_EXTERN_C -#else -# define NOT_NULL(X) X -#endif - -#define XP_STRLEN(s) strlen(NOT_NULL(s)) -#define XP_STRCMP(a, b) strcmp(NOT_NULL(a), NOT_NULL(b)) -#define XP_STRNCMP(a, b, n) strncmp(NOT_NULL(a), NOT_NULL(b), (n)) -#define XP_STRCPY(d, s) strcpy(NOT_NULL(d), NOT_NULL(s)) - -#endif /* XPSTRING_H */ -