From e266fb4015c62f35b0596ec08c6c23f32b076a06 Mon Sep 17 00:00:00 2001
From: "mcafee%netscape.com" <mcafee%netscape.com>
Date: Tue, 2 Feb 1999 03:08:03 +0000
Subject: [PATCH] Moving XP_ReBuffer() and XP_Trace() from xp_stubs.c to
 xp_stub.c, sorry I didn't see the original stub file.  Retiring xp_stubs.c.

---
 lib/xp/Makefile.in |  1 -
 lib/xp/xp_stub.c   | 32 +++++++++++++++++++++++++++++
 lib/xp/xp_stubs.c  | 50 ----------------------------------------------
 3 files changed, 32 insertions(+), 51 deletions(-)
 delete mode 100644 lib/xp/xp_stubs.c

diff --git a/lib/xp/Makefile.in b/lib/xp/Makefile.in
index 38ae54a564db..b104fb1029aa 100644
--- a/lib/xp/Makefile.in
+++ b/lib/xp/Makefile.in
@@ -57,7 +57,6 @@ CSRCS +=          \
 	xp_list.c \
 	xp_hash.c \
 	allxpstr.c \
-	xp_stubs.c \
 	$(NULL)
 
 EXPORTS=xp_linebuf.h
diff --git a/lib/xp/xp_stub.c b/lib/xp/xp_stub.c
index ca269225db0f..a7df58683711 100644
--- a/lib/xp/xp_stub.c
+++ b/lib/xp/xp_stub.c
@@ -88,3 +88,35 @@ XP_GetBuiltinString(int16 i)
 	return buf;
 }
 
+
+
+/* Unix to start, I'm guessing Win32 and Mac should also stub
+   this out here until these get re-implemented.  Put the stubs
+   here in xp-land so we can stop cut-and-pasting stubs in the
+   rest of the tree. */
+#ifdef XP_UNIX
+
+#include "xp_mcom.h"
+
+int XP_ReBuffer (const char *net_buffer, int32 net_buffer_size,
+                        uint32 desired_buffer_size,
+                        char **bufferP, uint32 *buffer_sizeP,
+                        uint32 *buffer_fpP,
+                        int32 (*per_buffer_fn) (char *buffer,
+                                                uint32 buffer_size,
+                                                void *closure),
+                        void *closure) 
+{ 
+
+  printf("XP_ReBuffer not implemented, stubbed in lib/xp/xp_stubs.c\n"); 
+  return(0); 
+}
+
+
+void XP_Trace( const char *message, ... ) 
+{ 
+  printf("XP_Trace not implemented, stubbed in lib/xp/xp_stubs.c\n"); 
+}
+
+#endif
+
diff --git a/lib/xp/xp_stubs.c b/lib/xp/xp_stubs.c
deleted file mode 100644
index 271a848d2fa3..000000000000
--- a/lib/xp/xp_stubs.c
+++ /dev/null
@@ -1,50 +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.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.
- */
-
-
-/* Unix to start, I'm guessing Win32 and Mac should also stub
-   this out here until these get re-implemented.  Put the stubs
-   here in xp-land so we can stop cut-and-pasting stubs in the
-   rest of the tree. */
-
-#ifdef XP_UNIX
-
-#include "xp_mcom.h"
-
-int XP_ReBuffer (const char *net_buffer, int32 net_buffer_size,
-                        uint32 desired_buffer_size,
-                        char **bufferP, uint32 *buffer_sizeP,
-                        uint32 *buffer_fpP,
-                        int32 (*per_buffer_fn) (char *buffer,
-                                                uint32 buffer_size,
-                                                void *closure),
-                        void *closure) 
-{ 
-
-  printf("XP_ReBuffer not implemented, stubbed in lib/xp/xp_stubs.c\n"); 
-  return(0); 
-}
-
-
-void XP_Trace( const char *message, ... ) 
-{ 
-  printf("XP_Trace not implemented, stubbed in lib/xp/xp_stubs.c\n"); 
-}
-
-#endif
-