From 1b73ce72f64795c1ec485d1ae934c89765a7b6ef Mon Sep 17 00:00:00 2001 From: "briano%netscape.com" Date: Fri, 4 Jun 1999 21:45:17 +0000 Subject: [PATCH] Cleaned up a bunch of old (unused?) crap. git-svn-id: svn://10.0.0.236/trunk@33776 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/sun-java/stubs/Makefile.in | 9 ++-- mozilla/sun-java/stubs/include/Makefile.in | 35 +++++++++++--- mozilla/sun-java/stubs/include/manifest.mn | 50 -------------------- mozilla/sun-java/stubs/include/typedefs_md.h | 12 +++-- mozilla/sun-java/stubs/jri/Makefile.in | 10 ++-- mozilla/sun-java/stubs/jri/manifest.mn | 35 -------------- mozilla/sun-java/stubs/src/Makefile.in | 21 ++++---- mozilla/sun-java/stubs/src/manifest.mn | 29 ------------ 8 files changed, 58 insertions(+), 143 deletions(-) delete mode 100644 mozilla/sun-java/stubs/include/manifest.mn delete mode 100644 mozilla/sun-java/stubs/jri/manifest.mn delete mode 100644 mozilla/sun-java/stubs/src/manifest.mn diff --git a/mozilla/sun-java/stubs/Makefile.in b/mozilla/sun-java/stubs/Makefile.in index 9ee28dbd37f..4432e914d12 100644 --- a/mozilla/sun-java/stubs/Makefile.in +++ b/mozilla/sun-java/stubs/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,14 +13,14 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -DEPTH = ../.. +DEPTH = ../.. topsrcdir = @top_srcdir@ VPATH = @srcdir@ srcdir = @srcdir@ +DIRS = jri include + include $(DEPTH)/config/autoconf.mk - -DIRS = jri include src - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/sun-java/stubs/include/Makefile.in b/mozilla/sun-java/stubs/include/Makefile.in index 7346b90f5c3..f91f5f2a640 100644 --- a/mozilla/sun-java/stubs/include/Makefile.in +++ b/mozilla/sun-java/stubs/include/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,14 +13,36 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -topsrcdir = @top_srcdir@ -VPATH = @srcdir@ -srcdir = @srcdir@ -USE_AUTOCONF = 1 +DEPTH = ../../.. +topsrcdir = @top_srcdir@ +VPATH = @srcdir@ +srcdir = @srcdir@ -include $(srcdir)/manifest.mn +MODULE = java + +EXPORTS = bool.h \ + interpreter.h \ + javaString.h \ + javaThreads.h \ + jmc.h \ + jni.h \ + jni_md.h \ + jri.h \ + jri_md.h \ + jriext.h \ + jritypes.h \ + nspr_md.h \ + oobj.h \ + sysmacros_md.h \ + tree.h \ + typedefs.h \ + typedefs_md.h \ + zip.h \ + $(NULL) + +EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/sun-java/stubs/include/manifest.mn b/mozilla/sun-java/stubs/include/manifest.mn deleted file mode 100644 index 0cc269ba2d6..00000000000 --- a/mozilla/sun-java/stubs/include/manifest.mn +++ /dev/null @@ -1,50 +0,0 @@ -# -# 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. - -MODULE = java - -LIBRARY_NAME = - -DEPTH = ../../.. - -DEFINES = -REQUIRES = - -CSRCS = - -EXPORTS = bool.h \ - interpreter.h \ - javaString.h \ - javaThreads.h \ - jmc.h \ - jni.h \ - jni_md.h \ - jri.h \ - jri_md.h \ - jriext.h \ - jritypes.h \ - nspr_md.h \ - oobj.h \ - sysmacros_md.h \ - tree.h \ - typedefs.h \ - typedefs_md.h \ - zip.h \ - $(NULL) -ifdef USE_AUTOCONF -EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) -endif - diff --git a/mozilla/sun-java/stubs/include/typedefs_md.h b/mozilla/sun-java/stubs/include/typedefs_md.h index e3b385c4082..3d013d30c40 100644 --- a/mozilla/sun-java/stubs/include/typedefs_md.h +++ b/mozilla/sun-java/stubs/include/typedefs_md.h @@ -46,9 +46,11 @@ typedef uint32 uint32_t; typedef prword_t uintVP_t; /* unsigned that is same size as a void pointer */ -#if !defined(BSDI) && !defined(IRIX6_2) && !defined(IRIX6_3) && !defined(LINUX) && !defined(SOLARIS2_6) && !defined(HPUX10_20) && !defined(HPUX10_30) && !defined(HPUX11) && !defined(RHAPSODY) && !defined(NETBSD) && !defined(AIX) && !defined(HPUX) +#if defined(HAVE_INT64) && !defined(HAVE_INT64_T) typedef int64 int64_t; -#else +#endif + +#if !defined(HAVE_INT64) && defined(HAVE_INT64_T) /* ** On BSDI, for some reason, they define long long's for these types ** even though they aren't actually 64 bits wide! @@ -56,9 +58,10 @@ typedef int64 int64_t; #define int64_t int64 #endif -#if defined(XP_PC) || (defined(__sun) && !defined(SVR4)) || defined(HPUX) || defined(LINUX) || defined(BSDI) /* || defined(XP_MAC) */ +#ifndef HAVE_UINT_T +#ifndef XP_MAC typedef unsigned int uint_t; -#elif defined(XP_MAC) +#else /* we have to push/pop to avoid breaking existing projects that ** have "treat warnings as errors" on. This is two, two, TWO hacks in one! (pinkerton) */ @@ -70,6 +73,7 @@ typedef unsigned long uint_t; /* this is already declared in OpenTransport.h, bu #endif /* __OPENTRANSPORT__ */ #pragma warning_errors reset #endif +#endif #if defined(XP_PC) && !defined(XP_OS2) typedef long int32_t; diff --git a/mozilla/sun-java/stubs/jri/Makefile.in b/mozilla/sun-java/stubs/jri/Makefile.in index 8ecdf4c5414..be18c66675f 100644 --- a/mozilla/sun-java/stubs/jri/Makefile.in +++ b/mozilla/sun-java/stubs/jri/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,14 +13,17 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# +DEPTH = ../../.. topsrcdir = @top_srcdir@ VPATH = @srcdir@ srcdir = @srcdir@ -USE_AUTOCONF = 1 -include $(srcdir)/manifest.mn +MODULE = java + +EXPORTS = java_lang_String.h jdk_java_lang_String.h +EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/sun-java/stubs/jri/manifest.mn b/mozilla/sun-java/stubs/jri/manifest.mn deleted file mode 100644 index 32a7e62ce3f..00000000000 --- a/mozilla/sun-java/stubs/jri/manifest.mn +++ /dev/null @@ -1,35 +0,0 @@ -# -# 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. - -MODULE = java - -LIBRARY_NAME = - -DEPTH = ../../.. - -DEFINES = -REQUIRES = - -CSRCS = - -EXPORTS = java_lang_String.h \ - jdk_java_lang_String.h \ - $(NULL) - -ifdef USE_AUTOCONF -EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) -endif - diff --git a/mozilla/sun-java/stubs/src/Makefile.in b/mozilla/sun-java/stubs/src/Makefile.in index 44e3d59fa40..52b68f9e29b 100644 --- a/mozilla/sun-java/stubs/src/Makefile.in +++ b/mozilla/sun-java/stubs/src/Makefile.in @@ -1,4 +1,3 @@ -#!gmake # # 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 @@ -14,17 +13,21 @@ # Communications Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. +# -topsrcdir = @top_srcdir@ -VPATH = @srcdir@ -srcdir = @srcdir@ -USE_AUTOCONF = 1 +DEPTH = ../../.. +topsrcdir = @top_srcdir@ +VPATH = @srcdir@ +srcdir = @srcdir@ -include $(srcdir)/manifest.mn +LIBRARY_NAME = stubsj +MODULE = java + +DEFINES = +REQUIRES = java + +CSRCS = stubsj.c include $(DEPTH)/config/autoconf.mk - include $(topsrcdir)/config/rules.mk -INCLUDES += -I$(DEPTH)/dist/public/img -I$(DEPTH)/dist/public/util -I$(DEPTH)/dist/public/layer - diff --git a/mozilla/sun-java/stubs/src/manifest.mn b/mozilla/sun-java/stubs/src/manifest.mn deleted file mode 100644 index 3f01654f028..00000000000 --- a/mozilla/sun-java/stubs/src/manifest.mn +++ /dev/null @@ -1,29 +0,0 @@ -# -# 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. - -MODULE = java - -LIBRARY_NAME = stubsj - -DEPTH = ../../.. - -DEFINES = -REQUIRES = java - -CSRCS = stubsj.c \ - $(NULL) - -EXPORTS =