From 11ee920b5476dbcb070afa5123e1069a2f4b0c8b Mon Sep 17 00:00:00 2001
From: cgd <cgd@NetBSD.org>
Date: Thu, 3 Feb 2000 19:46:21 +0000
Subject: [PATCH] rename printf.c to winprintf.c, nuke inclusion of libsa's
 printf.c in winprintf.c, and directly include libsa's printf.c in the
 project.

---
 sys/arch/hpcmips/stand/libsa/libsa.config            |  5 +++--
 sys/arch/hpcmips/stand/libsa/libsa.dsp               | 12 ++++++++----
 .../hpcmips/stand/libsa/{printf.c => winprintf.c}    |  5 +----
 3 files changed, 12 insertions(+), 10 deletions(-)
 rename sys/arch/hpcmips/stand/libsa/{printf.c => winprintf.c} (95%)

diff --git a/sys/arch/hpcmips/stand/libsa/libsa.config b/sys/arch/hpcmips/stand/libsa/libsa.config
index 0cbbec3d0f18..9791e57712a4 100644
--- a/sys/arch/hpcmips/stand/libsa/libsa.config
+++ b/sys/arch/hpcmips/stand/libsa/libsa.config
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: libsa.config,v 1.5 2000/02/03 19:32:42 cgd Exp $
+# $NetBSD: libsa.config,v 1.6 2000/02/03 19:46:21 cgd Exp $
 
 # config file/script to generate project file (.dsp) for libsa
 
@@ -13,15 +13,16 @@ SRCFILE_LIST='
 	../../../../lib/libsa/dkcksum.c
 	../../../../lib/libsa/lseek.c
 	../../../../lib/libsa/open.c
+	../../../../lib/libsa/printf.c
 	../../../../lib/libsa/read.c
 	../../../../lib/libsa/subr_prf.c
 	../../../../lib/libsa/twiddle.c
 	../../../../lib/libsa/ufs.c
 	alloc.c
 	devopen.c
-	printf.c
 	winblk.c
 	winfs.c
+	winprintf.c
 '
 CPPDEF_LIST='
 	_STANDALONE
diff --git a/sys/arch/hpcmips/stand/libsa/libsa.dsp b/sys/arch/hpcmips/stand/libsa/libsa.dsp
index 456d290aaef2..47a0734914f9 100644
--- a/sys/arch/hpcmips/stand/libsa/libsa.dsp
+++ b/sys/arch/hpcmips/stand/libsa/libsa.dsp
@@ -104,6 +104,10 @@ SOURCE=.\../../../../lib/libsa/open.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\../../../../lib/libsa/printf.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\../../../../lib/libsa/read.c
 # End Source File
 # Begin Source File
@@ -128,15 +132,15 @@ SOURCE=.\devopen.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\printf.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\winblk.c
 # End Source File
 # Begin Source File
 
 SOURCE=.\winfs.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\winprintf.c
+# End Source File
 # End Target
 # End Project
diff --git a/sys/arch/hpcmips/stand/libsa/printf.c b/sys/arch/hpcmips/stand/libsa/winprintf.c
similarity index 95%
rename from sys/arch/hpcmips/stand/libsa/printf.c
rename to sys/arch/hpcmips/stand/libsa/winprintf.c
index 5f37b12d21d7..f4c8e9f77272 100644
--- a/sys/arch/hpcmips/stand/libsa/printf.c
+++ b/sys/arch/hpcmips/stand/libsa/winprintf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: printf.c,v 1.3 2000/02/03 03:21:54 cgd Exp $	*/
+/*	$NetBSD: winprintf.c,v 1.1 2000/02/03 19:46:22 cgd Exp $	*/
 
 /*-
  * Copyright (c) 1999 Shin Takemura.
@@ -39,9 +39,6 @@
 #include <tchar.h>
 #include <stdarg.h>
 
-#include "../../../../lib/libsa/printf.c"
-
-
 int 
 win_printf(LPWSTR lpszFmt, ...)
 {