[Lsb-messages] /var/www/bzr/lsb/4.1/lsbspec r3816: pick up offsetof, getrlimi64 changes

[Mats Wichmann]

------------------------------------------------------------
revno: 3816
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: lsbspec
timestamp: Thu 2012-06-28 12:57:27 -0600
message:
  pick up offsetof, getrlimi64 changes
modified:
  LSB/generic/baselib/baselib.sgml
  LSB/generic/baselib/libc.sgml
-------------- next part --------------
=== modified file 'LSB/generic/baselib/baselib.sgml'
--- a/LSB/generic/baselib/baselib.sgml	2012-05-30 20:08:07 +0000
+++ b/LSB/generic/baselib/baselib.sgml	2012-06-28 18:57:27 +0000
@@ -6819,7 +6819,9 @@
 </PARA>
 <SCREEN>
 
-#define offsetof(TYPE,MEMBER)	((size_t)&amp;((TYPE*)0)->MEMBER)
+#if !defined(__GNUC__)
+#define __builtin_offsetof (TYPE, MEMBER)	((size_t)&amp;((TYPE*)0)->MEMBER)
+#endif
 #ifndef NULL
 #  ifdef __cplusplus
 #    define NULL        (0L)
@@ -6827,6 +6829,7 @@
 #    define NULL        ((void*) 0)
 #  endif
 #endif
+#define offsetof(TYPE,MEMBER)	__builtin_offsetof (TYPE, MEMBER)
 </SCREEN>
 </SECT2>
 <SECT2>
@@ -7594,7 +7597,8 @@
 extern int getpriority(__priority_which_t __which, id_t __who);
 extern int getrlimit(__rlimit_resource_t __resource,
 		     struct rlimit *__rlimits);
-extern int getrlimit64(id_t __resource, struct rlimit64 *__rlimits);
+extern int getrlimit64(__rlimit_resource_t __resource,
+		       struct rlimit64 *__rlimits);
 extern int getrusage(int __who, struct rusage *__usage);
 extern int setpriority(__priority_which_t __which, id_t __who, int __prio);
 extern int setrlimit(__rlimit_resource_t __resource,

=== modified file 'LSB/generic/baselib/libc.sgml'
--- a/LSB/generic/baselib/libc.sgml	2012-05-18 14:43:18 +0000
+++ b/LSB/generic/baselib/libc.sgml	2012-06-28 18:57:27 +0000
@@ -6750,7 +6750,9 @@
 </PARA>
 <SCREEN>
 
-#define offsetof(TYPE,MEMBER)	((size_t)&amp;((TYPE*)0)->MEMBER)
+#if !defined(__GNUC__)
+#define __builtin_offsetof (TYPE, MEMBER)	((size_t)&amp;((TYPE*)0)->MEMBER)
+#endif
 #ifndef NULL
 #  ifdef __cplusplus
 #    define NULL        (0L)
@@ -6758,6 +6760,7 @@
 #    define NULL        ((void*) 0)
 #  endif
 #endif
+#define offsetof(TYPE,MEMBER)	__builtin_offsetof (TYPE, MEMBER)
 </SCREEN>
 </SECT2>
 <SECT2>
@@ -7525,7 +7528,8 @@
 extern int getpriority(__priority_which_t __which, id_t __who);
 extern int getrlimit(__rlimit_resource_t __resource,
 		     struct rlimit *__rlimits);
-extern int getrlimit64(id_t __resource, struct rlimit64 *__rlimits);
+extern int getrlimit64(__rlimit_resource_t __resource,
+		       struct rlimit64 *__rlimits);
 extern int getrusage(int __who, struct rusage *__usage);
 extern int setpriority(__priority_which_t __which, id_t __who, int __prio);
 extern int setrlimit(__rlimit_resource_t __resource,