From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 21 Apr 2006 18:24:53 +0000 (+0000)
Subject: [BZ #2534, BZ #2535]
X-Git-Tag: cvs/fedora-glibc-20060424T0820~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41a3975907cfb52ee62199ae8fc287164e2f1cb5;p=thirdparty%2Fglibc.git

[BZ #2534, BZ #2535]

	* posix/regex.h: Remove obsolete <sys/types.h> and special
	handling for VMS.
---

diff --git a/ChangeLog b/ChangeLog
index 90121009389..d9f1cc2e94c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-04-21  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #2534, BZ #2535]
+	* posix/regex.h: Remove obsolete <sys/types.h> and special
+	handling for VMS.
+
 	* iconvdata/ibm437.c: Define HAS_HOLES to 0.
 	* iconvdata/ibm861.c: Likewise.
 	* iconvdata/ibm862.c: Likewise.
diff --git a/posix/regex.h b/posix/regex.h
index f6c145d209a..d787b9bff9a 100644
--- a/posix/regex.h
+++ b/posix/regex.h
@@ -1,6 +1,6 @@
 /* Definitions for data structures and routines for the regular
    expression library.
-   Copyright (C) 1985,1989-93,1995-98,2000,2001,2002,2003,2005
+   Copyright (C) 1985,1989-93,1995-98,2000,2001,2002,2003,2005,2006
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -29,15 +29,6 @@
 extern "C" {
 #endif
 
-/* POSIX says that <sys/types.h> must be included (by the caller) before
-   <regex.h>.  */
-
-#if !defined _POSIX_C_SOURCE && !defined _POSIX_SOURCE && defined VMS
-/* VMS doesn't have `size_t' in <sys/types.h>, even though POSIX says it
-   should be there.  */
-# include <stddef.h>
-#endif
-
 /* The following two types have to be signed and unsigned integer type
    wide enough to hold a value of a pointer.  For most ANSI compilers
    ptrdiff_t and size_t should be likely OK.  Still size of these two