diff options
| author | Ken Brown <kbrown@cornell.edu> | 2022-05-22 22:18:48 +0300 |
|---|---|---|
| committer | Ken Brown <kbrown@cornell.edu> | 2022-05-30 00:45:52 +0300 |
| commit | 2d9b48760c48f19b2941f05ee6720f510700823c (patch) | |
| tree | 693f2793b34d8aea8a57d8e0f6202d802eb91097 /winsup/cygwin/glob.cc | |
| parent | 7c0de0af97d35c8fed5ffbf311e54af85d1c4af3 (diff) | |
Cygwin: simplify some function names
Remove "32" or "64" from each of the following names: acl32,
aclcheck32, aclfrommode32, aclfrompbits32, aclfromtext32, aclsort32,
acltomode32, acltopbits32, acltotext32, facl32, fchown32, fcntl64,
fstat64, _fstat64, _fstat64_r, ftruncate64, getgid32, getgrent32,
getgrgid32, getgrnam32, getgroups32, getpwuid32, getpwuid_r32,
getuid32, getuid32, initgroups32, lseek64, lstat64, mknod32, mmap64,
setegid32, seteuid32, setgid32, setgroups32, setregid32, setreuid32,
setuid32, stat64, _stat64_r, truncate64.
Remove prototypes and macro definitions of these names.
Remove "#ifndef __INSIDE_CYGWIN__" from some headers so that the new
names will be available when compiling Cygwin.
Remove aliases that are no longer needed.
Include <unistd.h> in fhandler_clipboard.cc for the declarations of
geteuid and getegid.
Diffstat (limited to 'winsup/cygwin/glob.cc')
| -rw-r--r-- | winsup/cygwin/glob.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/winsup/cygwin/glob.cc b/winsup/cygwin/glob.cc index b14cf6dab..0d9f9c885 100644 --- a/winsup/cygwin/glob.cc +++ b/winsup/cygwin/glob.cc @@ -101,9 +101,6 @@ __FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.28 2010/05/12 17:44:00 gordon Ex #include "cygheap.h" #include "cygwin/version.h" -#define getpwuid(uid) getpwuid32 (uid) -#define getuid() getuid32 () - #define CCHAR(c) (ignore_case_with_glob ? towlower (CHAR (c)) : CHAR (c)) #define Cchar(c) (ignore_case_with_glob ? towlower (c) : (c)) #endif @@ -868,7 +865,7 @@ g_lstat(Char *fn, struct stat *sb, glob_t *pglob) } if (pglob->gl_flags & GLOB_ALTDIRFUNC) return CYGWIN_gl_stat (gl_lstat); - return(lstat64(buf, sb)); + return(lstat(buf, sb)); } static int @@ -882,7 +879,7 @@ g_stat(Char *fn, struct stat *sb, glob_t *pglob) } if (pglob->gl_flags & GLOB_ALTDIRFUNC) return CYGWIN_gl_stat (gl_stat); - return(stat64(buf, sb)); + return(stat(buf, sb)); } static const Char * |