X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ftempname.c;h=13a8204a4f48c2cc566821a2c9af0b1524f4eb3f;hb=a76a349e949dfad5716eb3893052070b770e949f;hp=382cb13e4714d6201b0299953e38eaa29cf0ddc4;hpb=6ff0c2a66fb36bdd6bac08993c2f3327e2cd2f28;p=gnulib.git

diff --git a/lib/tempname.c b/lib/tempname.c
index 382cb13e4..13a8204a4 100644
--- a/lib/tempname.c
+++ b/lib/tempname.c
@@ -1,20 +1,21 @@
-/* Copyright (C) 1991-1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
+/* tempname.c - generate the name of a temporary file.
 
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
+   Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-   The GNU C Library is distributed in the hope that it will be useful,
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
@@ -42,12 +43,14 @@
 # define __GT_NOCREATE	3
 #endif
 
+#include <stddef.h>
+
 #if STDC_HEADERS || _LIBC
-# include <stddef.h>
-# include <stdlib.h>
 # include <string.h>
 #endif
 
+#include <stdlib.h>
+
 #if HAVE_FCNTL_H || _LIBC
 # include <fcntl.h>
 #endif
@@ -59,6 +62,9 @@
 #if HAVE_STDINT_H || _LIBC
 # include <stdint.h>
 #endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
 
 #if HAVE_UNISTD_H || _LIBC
 # include <unistd.h>
@@ -105,13 +111,6 @@
 
 #if ! (HAVE___SECURE_GETENV || _LIBC)
 # define __secure_getenv getenv
-
-# ifndef HAVE_DECL_GETENV
-"this configure-time declaration test was not run"
-# endif
-# if !HAVE_DECL_GETENV
-char *getenv ();
-# endif
 #endif
 
 #ifdef _LIBC