aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--ctype/ctype.h5
-rw-r--r--dirent/dirent.h16
-rw-r--r--dlfcn/dlfcn.h6
-rw-r--r--sysdeps/generic/seekdir.c4
-rw-r--r--sysdeps/mach/hurd/seekdir.c4
-rw-r--r--sysdeps/unix/seekdir.c4
7 files changed, 38 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a23027..6418ae1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1999-08-18 Ulrich Drepper <drepper@cygnus.com>
+
+ * ctype/ctype.h: Avoid useless #endif #if pairs.
+
+ * dirent/dirent.h: Define ino_t and ino64_t if not done already.
+ (seekdir): Fix type of second parameter.
+ * sysdeps/generic/seekdir.c: Likewise.
+ * sysdeps/mach/hurd/seekdir.c: Likewise.
+ * sysdeps/unix/seekdir.c: Likewise.
+
+ * dlfcn/dlfcn.h: Define RTLD_NEXT and RTLD_DEFAULT only if __USE_GNU.
+
1999-08-18 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* manual/install.texi (Configuring and compiling): Clarify ix86
diff --git a/ctype/ctype.h b/ctype/ctype.h
index a0d8401..6ea0af0 100644
--- a/ctype/ctype.h
+++ b/ctype/ctype.h
@@ -122,14 +122,11 @@ extern int isascii __P ((int __c));
(i.e., the low-order 7 bits of C). */
extern int toascii __P ((int __c));
-#endif /* Use SVID or use misc. */
-
-#if defined __USE_SVID || defined __USE_MISC || defined __USE_XOPEN
/* These are the same as `toupper' and `tolower' except that they do not
check the argument for being in the range of a `char'. */
__exctype (_toupper);
__exctype (_tolower);
-#endif
+#endif /* Use SVID or use misc. */
#ifndef __NO_CTYPE
# define isalnum(c) __isctype((c), _ISalnum)
diff --git a/dirent/dirent.h b/dirent/dirent.h
index 472b480..7154b52 100644
--- a/dirent/dirent.h
+++ b/dirent/dirent.h
@@ -29,6 +29,20 @@ __BEGIN_DECLS
#include <bits/types.h>
+#ifdef __USE_XOPEN
+# ifndef __ino_t_defined
+# ifndef __USE_FILE_OFFSET64
+typedef __ino_t ino_t;
+# else
+typedef __ino64_t ino_t;
+# endif
+# define __ino_t_defined
+# endif
+# ifdef __USE_LARGEFILE64
+typedef __ino64_t ino64_t;
+# endif
+#endif
+
/* This file defines `struct dirent'.
It defines the macro `_DIRENT_HAVE_D_NAMLEN' iff there is a `d_namlen'
@@ -171,7 +185,7 @@ extern void rewinddir __P ((DIR *__dirp));
# include <bits/types.h>
/* Seek to position POS on DIRP. */
-extern void seekdir __P ((DIR *__dirp, __off_t __pos));
+extern void seekdir __P ((DIR *__dirp, long int __pos));
/* Return the current position of DIRP. */
extern long int telldir __P ((DIR *__dirp));
diff --git a/dlfcn/dlfcn.h b/dlfcn/dlfcn.h
index 76fdc3c..22ab9aa 100644
--- a/dlfcn/dlfcn.h
+++ b/dlfcn/dlfcn.h
@@ -27,16 +27,18 @@
/* Collect various system dependent definitions and declarations. */
#include <bits/dlfcn.h>
+#ifdef __USE_GNU
/* If the first argument of `dlsym' or `dlvsym' is set to RTLD_NEXT
the run-time address of the symbol called NAME in the next shared
object is returned. The "next" relation is defined by the order
the shared objects were loaded. */
-#define RTLD_NEXT ((void *) -1l)
+# define RTLD_NEXT ((void *) -1l)
/* If the first argument to `dlsym' or `dlvsym' is set to RTLD_DEFAULT
the run-time address of the symbol called NAME in the global scope
is returned. */
-#define RTLD_DEFAULT NULL
+# define RTLD_DEFAULT NULL
+#endif
__BEGIN_DECLS
diff --git a/sysdeps/generic/seekdir.c b/sysdeps/generic/seekdir.c
index c12d3af..1713709 100644
--- a/sysdeps/generic/seekdir.c
+++ b/sysdeps/generic/seekdir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996, 1997, 1999 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
@@ -25,7 +25,7 @@
void
seekdir (dirp, pos)
DIR *dirp;
- off_t pos;
+ long int pos;
{
if (dirp == NULL)
{
diff --git a/sysdeps/mach/hurd/seekdir.c b/sysdeps/mach/hurd/seekdir.c
index 047b4cd..9d7147c 100644
--- a/sysdeps/mach/hurd/seekdir.c
+++ b/sysdeps/mach/hurd/seekdir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 94, 95, 96, 97, 99 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
@@ -27,7 +27,7 @@
void
seekdir (dirp, pos)
DIR *dirp;
- __off_t pos;
+ long int pos;
{
__libc_lock_lock (dirp->__lock);
/* Change our entry index pointer to POS and discard any data already
diff --git a/sysdeps/unix/seekdir.c b/sysdeps/unix/seekdir.c
index caecbef..f89819d 100644
--- a/sysdeps/unix/seekdir.c
+++ b/sysdeps/unix/seekdir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996, 1997, 1999 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
@@ -27,7 +27,7 @@
void
seekdir (dirp, pos)
DIR *dirp;
- __off_t pos;
+ long int pos;
{
__libc_lock_lock (dirp->lock);
(void) __lseek(dirp->fd, pos, SEEK_SET);