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.
This commit is contained in:
Ulrich Drepper 1999-08-18 18:44:33 +00:00
parent ad1b5f1968
commit 70b2845f71
7 changed files with 38 additions and 13 deletions

View File

@ -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> 1999-08-18 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* manual/install.texi (Configuring and compiling): Clarify ix86 * manual/install.texi (Configuring and compiling): Clarify ix86

View File

@ -122,14 +122,11 @@ extern int isascii __P ((int __c));
(i.e., the low-order 7 bits of C). */ (i.e., the low-order 7 bits of C). */
extern int toascii __P ((int __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 /* These are the same as `toupper' and `tolower' except that they do not
check the argument for being in the range of a `char'. */ check the argument for being in the range of a `char'. */
__exctype (_toupper); __exctype (_toupper);
__exctype (_tolower); __exctype (_tolower);
#endif #endif /* Use SVID or use misc. */
#ifndef __NO_CTYPE #ifndef __NO_CTYPE
# define isalnum(c) __isctype((c), _ISalnum) # define isalnum(c) __isctype((c), _ISalnum)

View File

@ -29,6 +29,20 @@ __BEGIN_DECLS
#include <bits/types.h> #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'. /* This file defines `struct dirent'.
It defines the macro `_DIRENT_HAVE_D_NAMLEN' iff there is a `d_namlen' 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> # include <bits/types.h>
/* Seek to position POS on DIRP. */ /* 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. */ /* Return the current position of DIRP. */
extern long int telldir __P ((DIR *__dirp)); extern long int telldir __P ((DIR *__dirp));

View File

@ -27,16 +27,18 @@
/* Collect various system dependent definitions and declarations. */ /* Collect various system dependent definitions and declarations. */
#include <bits/dlfcn.h> #include <bits/dlfcn.h>
#ifdef __USE_GNU
/* If the first argument of `dlsym' or `dlvsym' is set to RTLD_NEXT /* 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 the run-time address of the symbol called NAME in the next shared
object is returned. The "next" relation is defined by the order object is returned. The "next" relation is defined by the order
the shared objects were loaded. */ 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 /* 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 the run-time address of the symbol called NAME in the global scope
is returned. */ is returned. */
#define RTLD_DEFAULT NULL # define RTLD_DEFAULT NULL
#endif
__BEGIN_DECLS __BEGIN_DECLS

View File

@ -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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -25,7 +25,7 @@
void void
seekdir (dirp, pos) seekdir (dirp, pos)
DIR *dirp; DIR *dirp;
off_t pos; long int pos;
{ {
if (dirp == NULL) if (dirp == NULL)
{ {

View File

@ -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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -27,7 +27,7 @@
void void
seekdir (dirp, pos) seekdir (dirp, pos)
DIR *dirp; DIR *dirp;
__off_t pos; long int pos;
{ {
__libc_lock_lock (dirp->__lock); __libc_lock_lock (dirp->__lock);
/* Change our entry index pointer to POS and discard any data already /* Change our entry index pointer to POS and discard any data already

View File

@ -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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -27,7 +27,7 @@
void void
seekdir (dirp, pos) seekdir (dirp, pos)
DIR *dirp; DIR *dirp;
__off_t pos; long int pos;
{ {
__libc_lock_lock (dirp->lock); __libc_lock_lock (dirp->lock);
(void) __lseek(dirp->fd, pos, SEEK_SET); (void) __lseek(dirp->fd, pos, SEEK_SET);