From 66a83f3eac1c9c8ad575c117b7c49995dc549d26 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Sat, 3 Jan 2009 05:12:22 +0000
Subject: Remove unneeded header files from source files throughout.  Update
 copyrights where appropriate. * globals.cc: New file for generic global
 variables. * mkglobals_h: New file to generate globals.h. * mkstatic: New
 Script used to build a (currently non-working) static libcygwin_s.a. *
 Makefile.in: Add unused rule to build a non-working libcygwin_s.a.
 (DLL_OFILES): Add globals.o.  Make all objects rely on globals.h.
 (globals.h): New target.  Generate globals.h. * cygtls.h: Honor new
 CYGTLS_HANDLE define to control when the HANDLE operator is allowed in
 _cygtls. * dcrt0.cc: Move most globals to globals.cc. * init.cc: Ditto. *
 environ.cc (strip_title_path): Remove now-unneeded extern. *
 fhandler_serial.cc (fhandler_serial::open): Ditto. * pinfo.cc: Ditto.
 (commune_process): Ditto. * shared.cc: Ditto. * glob.cc: Ditto. * strace.cc:
 Ditto. * exceptions.cc: Define CYGTLS_HANDLE before including winsup.h. *
 path.cc (stat_suffixes): Move here. * security.h: Add forward class path_conv
 declaration. * smallprint.cc (__small_vsprintf): Make a true c++ function.
 (__small_sprintf): Ditto. (small_printf): Ditto. (console_printf): Ditto.
 (__small_vswprintf): Ditto. (__small_swprintf): Ditto. * spawn.cc
 (spawn_guts): Remove _stdcall decoration in favor of regparm. (hExeced): Move
 to globals.cc * strfuncs.cc (current_codepage): Ditto. (active_codepage):
 Ditto. * sync.cc (lock_process::locker): Move here from dcrt0.cc. *
 syscalls.cc (stat_suffixes): Move to path.cc. * tty.cc (tty::create_master):
 Uncapitalize fatal warning for consistency. * winsup.h: Include globals.h to
 declare most of the grab bag list of globals which were previously defined
 here. * mount.h: Move USER_* defines back to shared_info.h. * speclib: Force
 temporary directory cleanup.

---
 winsup/cygwin/smallprint.cc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'winsup/cygwin/smallprint.cc')

diff --git a/winsup/cygwin/smallprint.cc b/winsup/cygwin/smallprint.cc
index 44fc05134..b646a9cee 100644
--- a/winsup/cygwin/smallprint.cc
+++ b/winsup/cygwin/smallprint.cc
@@ -1,6 +1,6 @@
 /* smallprint.cc: small print routines for WIN32
 
-   Copyright 1996, 1998, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2008
+   Copyright 1996, 1998, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009
    Red Hat, Inc.
 
 This file is part of Cygwin.
@@ -61,7 +61,7 @@ __rn (char *dst, int base, int dosign, long long val, int len, int pad, unsigned
   return dst;
 }
 
-extern "C" int
+int
 __small_vsprintf (char *dst, const char *fmt, va_list ap)
 {
   char tmp[NT_MAX_PATH];
@@ -223,7 +223,7 @@ __small_vsprintf (char *dst, const char *fmt, va_list ap)
   return dst - orig;
 }
 
-extern "C" int
+int
 __small_sprintf (char *dst, const char *fmt, ...)
 {
   int r;
@@ -234,7 +234,7 @@ __small_sprintf (char *dst, const char *fmt, ...)
   return r;
 }
 
-extern "C" void
+void
 small_printf (const char *fmt, ...)
 {
   char buf[16384];
@@ -261,7 +261,7 @@ small_printf (const char *fmt, ...)
 
 #ifdef DEBUGGING
 static HANDLE NO_COPY console_handle = NULL;
-extern "C" void
+void
 console_printf (const char *fmt, ...)
 {
   char buf[16384];
@@ -329,7 +329,7 @@ __wrn (PWCHAR dst, int base, int dosign, long long val, int len, int pad, unsign
   return dst;
 }
 
-extern "C" int
+int
 __small_vswprintf (PWCHAR dst, const WCHAR *fmt, va_list ap)
 {
   WCHAR tmp[NT_MAX_PATH];
@@ -466,7 +466,7 @@ __small_vswprintf (PWCHAR dst, const WCHAR *fmt, va_list ap)
   return dst - orig;
 }
 
-extern "C" int
+int
 __small_swprintf (PWCHAR dst, const WCHAR *fmt, ...)
 {
   int r;
-- 
cgit v1.2.3