diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/mntent.h | 10 | ||||
| -rw-r--r-- | misc/sys/cdefs.h | 12 |
2 files changed, 15 insertions, 7 deletions
diff --git a/misc/mntent.h b/misc/mntent.h index f7101c19dd..6acd532ba8 100644 --- a/misc/mntent.h +++ b/misc/mntent.h @@ -73,14 +73,16 @@ extern struct mntent *getmntent __P ((FILE *__stream)); #ifdef __USE_MISC /* Reentrant version of the above function. */ -extern struct mntent *getmntent_r __P ((FILE *__stream, - struct mntent *__result, - char *__buffer, int __bufsize)); +extern struct mntent *getmntent_r __P ((FILE *__restrict __stream, + struct mntent *__restrict __result, + char *__restrict __buffer, + int __bufsize)); #endif /* Write the mount table entry described by MNT to STREAM. Return zero on success, nonzero on failure. */ -extern int addmntent __P ((FILE *__stream, __const struct mntent *__mnt)); +extern int addmntent __P ((FILE *__restrict __stream, + __const struct mntent *__restrict __mnt)); /* Close a stream opened with `setmntent'. */ extern int endmntent __P ((FILE *__stream)); diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h index 539cbbc09f..24d5f315b7 100644 --- a/misc/sys/cdefs.h +++ b/misc/sys/cdefs.h @@ -19,7 +19,10 @@ #ifndef _SYS_CDEFS_H #define _SYS_CDEFS_H 1 +/* We are almost always included from features.h. */ +#ifndef _FEATURES_H #include <features.h> +#endif /* Some user header file might have defined this before. */ #undef __P @@ -152,8 +155,11 @@ #endif -/* No current version of gcc knows the `restrict' keyword. Define it - for now unconditionally to the empty string. */ -#define __restrict +/* __restrict is known in EGCS 1.2 and above. */ +#if !defined __GNUC__ || __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 92) + +# define __restrict /* Ignore */ + +#endif #endif /* sys/cdefs.h */ |