X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmkstemp.c;h=1b052f9b7f9dbea4058d0155587ac72248072bd4;hb=6fa2870cb33c7793d30df2fc10ecdbe2a0772d3a;hp=eabee0c11ff4eddc45d1d19a14ba6021127d21e0;hpb=6b35600aa75a122b58cf91345c202b741a97a347;p=gnulib.git

diff --git a/lib/mkstemp.c b/lib/mkstemp.c
index eabee0c11..1b052f9b7 100644
--- a/lib/mkstemp.c
+++ b/lib/mkstemp.c
@@ -1,29 +1,33 @@
-/* Copyright (C) 1998, 1999, 2001, 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2001, 2005, 2006, 2007 Free Software Foundation, Inc.
    This file is derived from the one in the GNU C Library.
 
-   This program is free software; you can redistribute it and/or modify
+   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.
+   the Free Software Foundation; either version 3 of the License, 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 General Public License for more details.
 
-   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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #if !_LIBC
 # include <config.h>
-# include "mkstemp.h"
-int __gen_tempname ();
 #endif
 
-#include <stdio.h>
 #include <stdlib.h>
 
+#if !_LIBC
+# include "tempname.h"
+# define __gen_tempname gen_tempname
+# define __GT_FILE GT_FILE
+#endif
+
+#include <stdio.h>
+
 #ifndef __GT_FILE
 # define __GT_FILE 0
 #endif