r2993 - glibc-package/trunk/debian/patches/all

[sthibaul-guest@alioth.debian.org]

Author: sthibaul-guest
Date: 2008-07-13 22:48:28 +0000 (Sun, 13 Jul 2008)
New Revision: 2993

Modified:
   glibc-package/trunk/debian/patches/all/submitted-fcntl-types.diff
Log:
mode_t and off_t are actually pulled from stat.h

Modified: glibc-package/trunk/debian/patches/all/submitted-fcntl-types.diff
===================================================================
--- glibc-package/trunk/debian/patches/all/submitted-fcntl-types.diff	2008-07-13 12:58:58 UTC (rev 2992)
+++ glibc-package/trunk/debian/patches/all/submitted-fcntl-types.diff	2008-07-13 22:48:28 UTC (rev 2993)
@@ -5,27 +5,13 @@
 diff -u -p -r1.43 fcntl.h
 --- glibc/io/fcntl.h	15 Sep 2007 22:34:56 -0000	1.43
 +++ glibc/io/fcntl.h	13 Jul 2008 01:10:02 -0000
-@@ -33,6 +33,29 @@ __BEGIN_DECLS
+@@ -33,6 +33,15 @@
     numbers and flag bits for `open', `fcntl', et al.  */
  #include <bits/fcntl.h>
  
 +#if defined __USE_XOPEN || defined __USE_XOPEN2K
 +/* The Single Unix specification says that some more types are
 +   available here.  */
-+# ifndef __mode_t_defined
-+typedef __mode_t mode_t;
-+#  define __mode_t_defined
-+# endif
-+
-+# ifndef __off_t_defined
-+#  ifndef __USE_FILE_OFFSET64
-+typedef __off_t off_t;
-+#  else
-+typedef __off64_t off_t;
-+#  endif
-+#  define __off_t_defined
-+# endif
-+
 +# ifndef __pid_t_defined
 +typedef __pid_t pid_t;
 +#  define __pid_t_defined