From f3fdfb670c80b8a98422b196fc63e7c9469c2361 Mon Sep 17 00:00:00 2001 From: Pawel Jakub Dawidek Date: Sat, 7 Apr 2007 16:02:30 +0000 Subject: [PATCH] - Remove SEEK_DATA and SEEK_HOLE from stdio.h, they don't belong here. - Only define SEEK_DATA and SEEK_HOLE in sys/unistd.h when neither _POSIX_SOURCE nor _XOPEN_SOURCE is defined. Pointed out by: bde, ache --- include/stdio.h | 6 ------ sys/sys/unistd.h | 2 ++ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/include/stdio.h b/include/stdio.h index bf014293530..348db22e181 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -200,12 +200,6 @@ __END_DECLS #ifndef SEEK_END #define SEEK_END 2 /* set file offset to EOF plus offset */ #endif -#ifndef SEEK_DATA -#define SEEK_DATA 3 /* set file offset to next data past offset */ -#endif -#ifndef SEEK_HOLE -#define SEEK_HOLE 4 /* set file offset to next hole past offset */ -#endif #define stdin __stdinp #define stdout __stdoutp diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h index 9f3eac920fb..752e135789c 100644 --- a/sys/sys/unistd.h +++ b/sys/sys/unistd.h @@ -107,6 +107,8 @@ #define SEEK_SET 0 /* set file offset to offset */ #define SEEK_CUR 1 /* set file offset to current plus offset */ #define SEEK_END 2 /* set file offset to EOF plus offset */ +#endif +#if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE) #define SEEK_DATA 3 /* set file offset to next data past offset */ #define SEEK_HOLE 4 /* set file offset to next hole past offset */ #endif