CVS update: /ccvs/lib/

User: dprice  
Date: 05/05/19 15:53:57

Modified:
 /ccvs/lib/
  ChangeLog, glob.c

Log:
 * glob.c: Don't delcare protos for getlogin or getlogin_r if we got one
 from <unistd.h>.

File Changes:

Directory: /ccvs/lib/
=====================

File [changed]: ChangeLog
Url: https://ccvs.cvshome.org/source/browse/ccvs/lib/ChangeLog?r1=1.429&r2=1.430
Delta lines:  +5 -0
-------------------
--- ChangeLog	18 May 2005 18:49:21 -0000	1.429
+++ ChangeLog	19 May 2005 22:53:55 -0000	1.430
@@ -1,3 +1,8 @@
+2005-05-19  Derek Price  <[email protected]>
+
+	* glob.c: Don't delcare protos for getlogin or getlogin_r if we got one
+	from <unistd.h>.
+
 2005-05-18  Derek Price  <[email protected]>
 
 	* glob.c (GETPW_R_SIZE_MAX): Remove `;' from macro definition.

File [changed]: glob.c
Url: https://ccvs.cvshome.org/source/browse/ccvs/lib/glob.c?r1=1.8&r2=1.9
Delta lines:  +8 -6
-------------------
--- glob.c	18 May 2005 18:49:21 -0000	1.8
+++ glob.c	19 May 2005 22:53:55 -0000	1.9
@@ -41,6 +41,14 @@
 #   define POSIX
 #  endif
 # endif
+#else
+/* Is there really a case where the getlogin or getlogin_r proto can come from
+   somewhere other than <unistd.h>?  */
+# ifdef HAVE_GETLOGIN_R
+extern int getlogin_r (char *, size_t);
+# else
+extern char *getlogin (void);
+# endif
 #endif
 
 #include <pwd.h>
@@ -190,12 +198,6 @@
 # define __readdir64 readdir64
 #endif
 
-#ifdef HAVE_GETLOGIN_R
-extern int getlogin_r (char *, size_t);
-#else
-extern char *getlogin (void);
-#endif
-
 #ifdef _SC_GETPW_R_SIZE_MAX
 # define GETPW_R_SIZE_MAX()	sysconf (_SC_GETPW_R_SIZE_MAX)
 #else