Clean up mkstemps64 definition for O_LARGEFILE==0.

diff --git a/ChangeLog b/ChangeLog
index 04efecfa45687c7e18f38082c1fc5c35db7c4065..400a54e781e45f71b50cb892ccf5cc9fbb09bf2f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,11 +5,14 @@
 
        * misc/mkstemp.c [!defined O_LARGEFILE || O_LARGEFILE == 0]:
        Define mkstemp64 as an alias.
+       * misc/mkstemps.c [!defined O_LARGEFILE || O_LARGEFILE == 0]:
+       Define mkstemps64 as an alias.
        * misc/mkostemp.c [!defined O_LARGEFILE || O_LARGEFILE == 0]:
        Define mkostemp64 as an alias.
        * misc/mkstemp64.c [defined O_LARGEFILE && O_LARGEFILE != 0]:
        Conditionalize body on this.
        * misc/mkostemp64.c: Likewise.
+       * misc/mkstemps64.c: Likewise.
        * sysdeps/wordsize-64/mkstemp64.c: File removed.
        * sysdeps/wordsize-64/mkostemp64.c: File removed.
        * sysdeps/wordsize-64/mkostemp.c: File removed.

diff --git a/misc/mkstemps.c b/misc/mkstemps.c
index 26205dc1bbbd68c54ddb5ebc13bcb1a2d0f1e070..79418c58dfe67ba67fa0727e0a37ef4953a72ed4 100644 (file)
--- a/misc/mkstemps.c
+++ b/misc/mkstemps.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2009-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -40,3 +40,7 @@ mkstemps (template, suffixlen)
 
   return __gen_tempname (template, suffixlen, 0, __GT_FILE);
 }
+
+#if !defined O_LARGEFILE || O_LARGEFILE == 0
+weak_alias (mkstemps, mkstemps64)
+#endif

diff --git a/misc/mkstemps64.c b/misc/mkstemps64.c
index b4af7ca40789388cb5c4690c79bfeadb610da333..8393a516d1816e172eb29762b9dbf066b56c510d 100644 (file)
--- a/misc/mkstemps64.c
+++ b/misc/mkstemps64.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2007, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2000-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -20,6 +20,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+/* If O_LARGEFILE is zero, mkstemps.c defines mkstemps64 as an alias.  */
+#if defined O_LARGEFILE && O_LARGEFILE != 0
+
 /* Generate a unique temporary file name from TEMPLATE.  The last six
    characters before a suffix of length SUFFIXLEN of TEMPLATE must be
    "XXXXXX"; they are replaced with a string that makes the filename
@@ -37,3 +40,5 @@ mkstemps64 (template, suffixlen)
 
   return __gen_tempname (template, suffixlen, O_LARGEFILE, __GT_FILE);
 }
+
+#endif