[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2049: move off64_t to sys/types.h, affects some auto-includes in hdrs (bug 3717)

Mats Wichmann mats at linuxfoundation.org
Wed Jan 30 21:58:08 UTC 2013


------------------------------------------------------------
revno: 2049
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Wed 2013-01-30 14:58:08 -0700
message:
  move off64_t to sys/types.h, affects some auto-includes in hdrs (bug 3717)
modified:
  headers/All/3.0/sys/types.h.defs
  headers/All/3.0/unistd.h.defs
  headers/All/3.1/sys/types.h.defs
  headers/All/3.1/unistd.h.defs
  headers/All/3.2/sys/types.h.defs
  headers/All/3.2/unistd.h.defs
  headers/All/4.0/sys/types.h.defs
  headers/All/4.0/unistd.h.defs
  headers/All/4.1/sys/types.h.defs
  headers/All/4.1/unistd.h.defs
  headers/All/5.0/sys/types.h.defs
  headers/All/5.0/unistd.h.defs
  headers/fcntl.h
  headers/ftw.h
  headers/stdio.h
  headers/sys/mman.h
  headers/sys/sendfile.h
  headers/sys/stat.h
  headers/sys/types.h
  headers/unistd.h
  package/Makefile
-------------- next part --------------
=== modified file 'headers/All/3.0/sys/types.h.defs'
--- a/headers/All/3.0/sys/types.h.defs	2009-10-08 16:33:41 +0000
+++ b/headers/All/3.0/sys/types.h.defs	2013-01-30 21:58:08 +0000
@@ -21,6 +21,7 @@
 typedef unsigned int uid_t;
 typedef int pid_t;
 typedef long int off_t;
+typedef long long int off64_t;
 typedef int key_t;
 typedef long int suseconds_t;
 typedef unsigned int u_int;

=== modified file 'headers/All/3.0/unistd.h.defs'
--- a/headers/All/3.0/unistd.h.defs	2012-06-14 21:16:13 +0000
+++ b/headers/All/3.0/unistd.h.defs	2013-01-30 21:58:08 +0000
@@ -6,8 +6,6 @@
 #define SEEK_END	2
 #define STDERR_FILENO	2
 
-typedef long long int off64_t;
-
 #define F_OK	0
 #define X_OK	1
 #define W_OK	2

=== modified file 'headers/All/3.1/sys/types.h.defs'
--- a/headers/All/3.1/sys/types.h.defs	2009-10-08 16:33:41 +0000
+++ b/headers/All/3.1/sys/types.h.defs	2013-01-30 21:58:08 +0000
@@ -21,6 +21,7 @@
 typedef unsigned int uid_t;
 typedef int pid_t;
 typedef long int off_t;
+typedef long long int off64_t;
 typedef int key_t;
 typedef long int suseconds_t;
 typedef unsigned int u_int;

=== modified file 'headers/All/3.1/unistd.h.defs'
--- a/headers/All/3.1/unistd.h.defs	2012-06-14 21:16:13 +0000
+++ b/headers/All/3.1/unistd.h.defs	2013-01-30 21:58:08 +0000
@@ -6,8 +6,6 @@
 #define SEEK_END	2
 #define STDERR_FILENO	2
 
-typedef long long int off64_t;
-
 #define F_OK	0
 #define X_OK	1
 #define W_OK	2

=== modified file 'headers/All/3.2/sys/types.h.defs'
--- a/headers/All/3.2/sys/types.h.defs	2009-10-08 16:33:41 +0000
+++ b/headers/All/3.2/sys/types.h.defs	2013-01-30 21:58:08 +0000
@@ -21,6 +21,7 @@
 typedef unsigned int uid_t;
 typedef int pid_t;
 typedef long int off_t;
+typedef long long int off64_t;
 typedef int key_t;
 typedef long int suseconds_t;
 typedef unsigned int u_int;

=== modified file 'headers/All/3.2/unistd.h.defs'
--- a/headers/All/3.2/unistd.h.defs	2012-06-14 21:16:13 +0000
+++ b/headers/All/3.2/unistd.h.defs	2013-01-30 21:58:08 +0000
@@ -6,8 +6,6 @@
 #define SEEK_END	2
 #define STDERR_FILENO	2
 
-typedef long long int off64_t;
-
 #define F_OK	0
 #define X_OK	1
 #define W_OK	2

=== modified file 'headers/All/4.0/sys/types.h.defs'
--- a/headers/All/4.0/sys/types.h.defs	2009-10-08 16:33:41 +0000
+++ b/headers/All/4.0/sys/types.h.defs	2013-01-30 21:58:08 +0000
@@ -21,6 +21,7 @@
 typedef unsigned int uid_t;
 typedef int pid_t;
 typedef long int off_t;
+typedef long long int off64_t;
 typedef int key_t;
 typedef long int suseconds_t;
 typedef unsigned int u_int;

=== modified file 'headers/All/4.0/unistd.h.defs'
--- a/headers/All/4.0/unistd.h.defs	2012-06-14 21:16:13 +0000
+++ b/headers/All/4.0/unistd.h.defs	2013-01-30 21:58:08 +0000
@@ -6,8 +6,6 @@
 #define SEEK_END	2
 #define STDERR_FILENO	2
 
-typedef long long int off64_t;
-
 #define F_OK	0
 #define X_OK	1
 #define W_OK	2

=== modified file 'headers/All/4.1/sys/types.h.defs'
--- a/headers/All/4.1/sys/types.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/All/4.1/sys/types.h.defs	2013-01-30 21:58:08 +0000
@@ -21,6 +21,7 @@
 typedef unsigned int uid_t;
 typedef int pid_t;
 typedef long int off_t;
+typedef long long int off64_t;
 typedef int key_t;
 typedef long int suseconds_t;
 typedef unsigned int u_int;

=== modified file 'headers/All/4.1/unistd.h.defs'
--- a/headers/All/4.1/unistd.h.defs	2012-06-14 21:16:13 +0000
+++ b/headers/All/4.1/unistd.h.defs	2013-01-30 21:58:08 +0000
@@ -6,8 +6,6 @@
 #define SEEK_END	2
 #define STDERR_FILENO	2
 
-typedef long long int off64_t;
-
 #define F_OK	0
 #define X_OK	1
 #define W_OK	2

=== modified file 'headers/All/5.0/sys/types.h.defs'
--- a/headers/All/5.0/sys/types.h.defs	2012-05-29 16:42:13 +0000
+++ b/headers/All/5.0/sys/types.h.defs	2013-01-30 21:58:08 +0000
@@ -13,6 +13,7 @@
 typedef unsigned int uid_t;
 typedef int pid_t;
 typedef long int off_t;
+typedef long long int off64_t;
 typedef int key_t;
 typedef long int suseconds_t;
 typedef unsigned int u_int;

=== modified file 'headers/All/5.0/unistd.h.defs'
--- a/headers/All/5.0/unistd.h.defs	2012-06-14 21:16:13 +0000
+++ b/headers/All/5.0/unistd.h.defs	2013-01-30 21:58:08 +0000
@@ -6,8 +6,6 @@
 #define SEEK_END	2
 #define STDERR_FILENO	2
 
-typedef long long int off64_t;
-
 #define F_OK	0
 #define X_OK	1
 #define W_OK	2

=== modified file 'headers/fcntl.h'
--- a/headers/fcntl.h	2012-05-18 11:07:48 +0000
+++ b/headers/fcntl.h	2013-01-30 21:58:08 +0000
@@ -3,7 +3,6 @@
 #define _FCNTL_H_
 
 #include <sys/types.h>
-#include <unistd.h>
 
 #ifdef __cplusplus
 extern "C" {

=== modified file 'headers/ftw.h'
--- a/headers/ftw.h	2009-04-26 12:14:54 +0000
+++ b/headers/ftw.h	2013-01-30 21:58:08 +0000
@@ -4,7 +4,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <sys/time.h>
 
 #ifdef __cplusplus

=== modified file 'headers/stdio.h'
--- a/headers/stdio.h	2013-01-08 15:55:54 +0000
+++ b/headers/stdio.h	2013-01-30 21:58:08 +0000
@@ -3,7 +3,6 @@
 #define _STDIO_H_
 
 #include <sys/types.h>
-#include <unistd.h>
 #include <wctype.h>
 #include <stddef.h>
 #include <stdarg.h>

=== modified file 'headers/sys/mman.h'
--- a/headers/sys/mman.h	2009-04-26 12:14:54 +0000
+++ b/headers/sys/mman.h	2013-01-30 21:58:08 +0000
@@ -3,7 +3,6 @@
 #define _SYS_MMAN_H_
 
 #include <sys/types.h>
-#include <unistd.h>
 #include <stddef.h>
 
 #ifdef __cplusplus

=== modified file 'headers/sys/sendfile.h'
--- a/headers/sys/sendfile.h	2009-04-26 12:14:54 +0000
+++ b/headers/sys/sendfile.h	2013-01-30 21:58:08 +0000
@@ -3,7 +3,6 @@
 #define _SYS_SENDFILE_H_
 
 #include <sys/types.h>
-#include <unistd.h>
 #include <stddef.h>
 #include <stdint.h>
 

=== modified file 'headers/sys/stat.h'
--- a/headers/sys/stat.h	2011-01-28 13:30:02 +0000
+++ b/headers/sys/stat.h	2013-01-30 21:58:08 +0000
@@ -3,7 +3,6 @@
 #define _SYS_STAT_H_
 
 #include <sys/types.h>
-#include <unistd.h>
 #include <sys/time.h>
 
 #ifdef __cplusplus

=== modified file 'headers/sys/types.h'
--- a/headers/sys/types.h	2012-06-14 21:16:13 +0000
+++ b/headers/sys/types.h	2013-01-30 21:58:08 +0000
@@ -52,6 +52,8 @@
 
     typedef unsigned int uid_t;
 
+    typedef long long int off64_t;
+
     typedef long int suseconds_t;
 
     typedef unsigned int u_int;

=== modified file 'headers/unistd.h'
--- a/headers/unistd.h	2012-06-14 21:16:13 +0000
+++ b/headers/unistd.h	2013-01-30 21:58:08 +0000
@@ -32,11 +32,6 @@
 
 
 
-#if __LSB_VERSION__ >= 12
-    typedef long long int off64_t;
-
-#endif				/* __LSB_VERSION__ >= 1.2 */
-
 
 /* Values for the second argument to access.*/
 #if __LSB_VERSION__ >= 11

=== modified file 'package/Makefile'
--- a/package/Makefile	2013-01-26 13:21:24 +0000
+++ b/package/Makefile	2013-01-30 21:58:08 +0000
@@ -42,7 +42,7 @@
 # Should have leading "."
 # a big number (80-99) is leading up to the next minor spec
 # build_env is version-independent so can wait till late to bump this
-SUB_VERSION=.25
+SUB_VERSION=.26
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called



More information about the lsb-messages mailing list