diff options
| author | Roland McGrath <roland@hack.frob.com> | 2012-08-01 11:09:48 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2012-08-01 11:09:48 -0700 |
| commit | 3f55550c148593f4a0db9eec939554bcf3f0bcd4 (patch) | |
| tree | c7e878c53c85055fd2855d0f91a8bd2bc72980a4 | |
| parent | 48aec5b988f420a36ee4549865f9525584faa336 (diff) | |
| download | glibc-3f55550c148593f4a0db9eec939554bcf3f0bcd4.tar.gz glibc-3f55550c148593f4a0db9eec939554bcf3f0bcd4.tar.xz glibc-3f55550c148593f4a0db9eec939554bcf3f0bcd4.zip | |
Clean up mkstemps64 definition for O_LARGEFILE==0.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | misc/mkstemps.c | 6 | ||||
| -rw-r--r-- | misc/mkstemps64.c | 7 |
3 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 04efecfa45..400a54e781 100644 --- 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 26205dc1bb..79418c58df 100644 --- 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 b4af7ca407..8393a516d1 100644 --- 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 |