[Lsb-messages] /var/www/bzr/lsb/devel/devchk r2345: regen to pick up recent header fiddling
Mats Wichmann
mats at linuxfoundation.org
Wed Feb 6 19:54:55 UTC 2013
------------------------------------------------------------
revno: 2345
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: devchk
timestamp: Wed 2013-02-06 12:54:55 -0700
message:
regen to pick up recent header fiddling
modified:
ts/devchk/libpng15_png_h.c
ts/devchk/stdio_h.c
ts/devchk/sys_time_h.c
ts/devchk/time_h.c
ts/devchk/unistd_h.c
-------------- next part --------------
=== modified file 'ts/devchk/libpng15_png_h.c'
--- a/ts/devchk/libpng15_png_h.c 2013-01-11 16:08:10 +0000
+++ b/ts/devchk/libpng15_png_h.c 2013-02-06 19:54:55 +0000
@@ -768,6 +768,36 @@
/* No test for png.h depends on pnglibconf.h */
#endif
+#if _LSB_DEFAULT_ARCH
+#ifdef PNG_FILLER_BEFORE
+ CompareConstant(PNG_FILLER_BEFORE,0,24932,architecture,5.0,NULL)
+#else
+Msg( "Error: Constant not found: PNG_FILLER_BEFORE\n");
+cnt++;
+#endif
+
+#endif
+
+#if _LSB_DEFAULT_ARCH
+#ifdef PNG_FILLER_AFTER
+ CompareConstant(PNG_FILLER_AFTER,1,24933,architecture,5.0,NULL)
+#else
+Msg( "Error: Constant not found: PNG_FILLER_AFTER\n");
+cnt++;
+#endif
+
+#endif
+
+#if _LSB_DEFAULT_ARCH
+#ifdef PNG_COLOR_TYPE_GRAY
+ CompareConstant(PNG_COLOR_TYPE_GRAY,0,24934,architecture,5.0,NULL)
+#else
+Msg( "Error: Constant not found: PNG_COLOR_TYPE_GRAY\n");
+cnt++;
+#endif
+
+#endif
+
#if defined __x86_64__
CheckTypeSize(png_libpng_version_1_5_13,8, 10000003, 11, 5.0, NULL, 63, NULL)
#elif defined __i386__
@@ -2504,11 +2534,11 @@
extern void png_set_alpha_mode_db(png_structp, int, double);
CheckInterfacedef(png_set_alpha_mode,png_set_alpha_mode_db);
-extern png_uint_32 png_get_hIST_db(png_const_structp, png_const_infop);
+extern png_uint_32 png_get_hIST_db(png_const_structp, png_const_infop, png_uint_16p *);
CheckInterfacedef(png_get_hIST,png_get_hIST_db);
extern void png_write_row_db(png_structp, png_const_bytep);
CheckInterfacedef(png_write_row,png_write_row_db);
-extern png_uint_32 png_get_pHYs_db(png_const_structp, png_const_infop, png_int_32 *, png_int_32 *, int *);
+extern png_uint_32 png_get_pHYs_db(png_const_structp, png_const_infop, png_uint_32 *, png_uint_32 *, int *);
CheckInterfacedef(png_get_pHYs,png_get_pHYs_db);
extern void png_set_sig_bytes_db(png_structp, int);
CheckInterfacedef(png_set_sig_bytes,png_set_sig_bytes_db);
@@ -2942,7 +2972,7 @@
CheckInterfacedef(png_get_x_pixels_per_inch,png_get_x_pixels_per_inch_db);
extern png_uint_32 png_get_y_pixels_per_inch_db(png_const_structp, png_const_infop);
CheckInterfacedef(png_get_y_pixels_per_inch,png_get_y_pixels_per_inch_db);
-extern png_uint_32 png_get_pHYs_dpi_db(png_const_structp, png_const_infop, png_int_32 *, png_int_32 *, int *);
+extern png_uint_32 png_get_pHYs_dpi_db(png_const_structp, png_const_infop, png_uint_32 *, png_uint_32 *, int *);
CheckInterfacedef(png_get_pHYs_dpi,png_get_pHYs_dpi_db);
extern png_uint_32 png_get_io_state_db(png_structp);
CheckInterfacedef(png_get_io_state,png_get_io_state_db);
=== modified file 'ts/devchk/stdio_h.c'
--- a/ts/devchk/stdio_h.c 2013-02-05 13:58:21 +0000
+++ b/ts/devchk/stdio_h.c 2013-02-06 19:54:55 +0000
@@ -404,6 +404,8 @@
CheckInterfacedef(putw,putw_db);
extern int remove_db(const char *);
CheckInterfacedef(remove,remove_db);
+extern int rename_db(const char *, const char *);
+CheckInterfacedef(rename,rename_db);
extern void rewind_db(FILE *);
CheckInterfacedef(rewind,rewind_db);
extern int scanf_db(const char *, ...);
=== modified file 'ts/devchk/sys_time_h.c'
--- a/ts/devchk/sys_time_h.c 2012-10-01 13:17:07 +0000
+++ b/ts/devchk/sys_time_h.c 2013-02-06 19:54:55 +0000
@@ -59,6 +59,39 @@
#endif
#if defined __s390x__
+CheckTypeSize(struct timeval,16, 9858, 12, 1.3, NULL, 0, NULL)
+CheckMemberSize(struct timeval,tv_usec,8,12,33505)
+CheckOffset(struct timeval,tv_usec,8,12,33505)
+#elif defined __x86_64__
+CheckTypeSize(struct timeval,16, 9858, 11, 2.0, NULL, 0, NULL)
+CheckMemberSize(struct timeval,tv_usec,8,11,33505)
+CheckOffset(struct timeval,tv_usec,8,11,33505)
+#elif defined __s390__ && !defined __s390x__
+CheckTypeSize(struct timeval,8, 9858, 10, 1.3, NULL, 0, NULL)
+CheckMemberSize(struct timeval,tv_usec,4,10,33505)
+CheckOffset(struct timeval,tv_usec,4,10,33505)
+#elif defined __powerpc64__
+CheckTypeSize(struct timeval,16, 9858, 9, 2.0, NULL, 0, NULL)
+CheckMemberSize(struct timeval,tv_usec,8,9,33505)
+CheckOffset(struct timeval,tv_usec,8,9,33505)
+#elif defined __powerpc__ && !defined __powerpc64__
+CheckTypeSize(struct timeval,8, 9858, 6, 1.2, NULL, 0, NULL)
+CheckMemberSize(struct timeval,tv_usec,4,6,33505)
+CheckOffset(struct timeval,tv_usec,4,6,33505)
+#elif defined __ia64__
+CheckTypeSize(struct timeval,16, 9858, 3, 1.3, NULL, 0, NULL)
+CheckMemberSize(struct timeval,tv_usec,8,3,33505)
+CheckOffset(struct timeval,tv_usec,8,3,33505)
+#elif defined __i386__
+CheckTypeSize(struct timeval,8, 9858, 2, 1.2, NULL, 0, NULL)
+CheckMemberSize(struct timeval,tv_usec,4,2,33505)
+CheckOffset(struct timeval,tv_usec,4,2,33505)
+#else
+Msg("Find size of timeval (9858)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.2""',NULL,0,NULL);\n",architecture,9858,0);
+#endif
+
+#if defined __s390x__
CheckTypeSize(struct timezone,8, 9855, 12, 1.3, NULL, 0, NULL)
CheckMemberSize(struct timezone,tz_dsttime,4,12,33507)
CheckOffset(struct timezone,tz_dsttime,4,12,33507)
@@ -128,72 +161,6 @@
CheckTypeSize(__itimer_which_t,4, 9862, 1, 2.0, NULL, 6, NULL)
#endif
-#if defined __s390x__
-CheckTypeSize(struct timespec,16, 7018, 12, 1.3, NULL, 0, NULL)
-CheckMemberSize(struct timespec,tv_nsec,8,12,33503)
-CheckOffset(struct timespec,tv_nsec,8,12,33503)
-#elif defined __x86_64__
-CheckTypeSize(struct timespec,16, 7018, 11, 2.0, NULL, 0, NULL)
-CheckMemberSize(struct timespec,tv_nsec,8,11,33503)
-CheckOffset(struct timespec,tv_nsec,8,11,33503)
-#elif defined __s390__ && !defined __s390x__
-CheckTypeSize(struct timespec,8, 7018, 10, 1.3, NULL, 0, NULL)
-CheckMemberSize(struct timespec,tv_nsec,4,10,33503)
-CheckOffset(struct timespec,tv_nsec,4,10,33503)
-#elif defined __powerpc64__
-CheckTypeSize(struct timespec,16, 7018, 9, 2.0, NULL, 0, NULL)
-CheckMemberSize(struct timespec,tv_nsec,8,9,33503)
-CheckOffset(struct timespec,tv_nsec,8,9,33503)
-#elif defined __powerpc__ && !defined __powerpc64__
-CheckTypeSize(struct timespec,8, 7018, 6, 1.2, NULL, 0, NULL)
-CheckMemberSize(struct timespec,tv_nsec,4,6,33503)
-CheckOffset(struct timespec,tv_nsec,4,6,33503)
-#elif defined __ia64__
-CheckTypeSize(struct timespec,16, 7018, 3, 1.3, NULL, 0, NULL)
-CheckMemberSize(struct timespec,tv_nsec,8,3,33503)
-CheckOffset(struct timespec,tv_nsec,8,3,33503)
-#elif defined __i386__
-CheckTypeSize(struct timespec,8, 7018, 2, 1.2, NULL, 0, NULL)
-CheckMemberSize(struct timespec,tv_nsec,4,2,33503)
-CheckOffset(struct timespec,tv_nsec,4,2,33503)
-#else
-Msg("Find size of timespec (7018)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.2""',NULL,0,NULL);\n",architecture,7018,0);
-#endif
-
-#if defined __s390x__
-CheckTypeSize(struct timeval,16, 9858, 12, 1.3, NULL, 0, NULL)
-CheckMemberSize(struct timeval,tv_usec,8,12,33505)
-CheckOffset(struct timeval,tv_usec,8,12,33505)
-#elif defined __x86_64__
-CheckTypeSize(struct timeval,16, 9858, 11, 2.0, NULL, 0, NULL)
-CheckMemberSize(struct timeval,tv_usec,8,11,33505)
-CheckOffset(struct timeval,tv_usec,8,11,33505)
-#elif defined __s390__ && !defined __s390x__
-CheckTypeSize(struct timeval,8, 9858, 10, 1.3, NULL, 0, NULL)
-CheckMemberSize(struct timeval,tv_usec,4,10,33505)
-CheckOffset(struct timeval,tv_usec,4,10,33505)
-#elif defined __powerpc64__
-CheckTypeSize(struct timeval,16, 9858, 9, 2.0, NULL, 0, NULL)
-CheckMemberSize(struct timeval,tv_usec,8,9,33505)
-CheckOffset(struct timeval,tv_usec,8,9,33505)
-#elif defined __powerpc__ && !defined __powerpc64__
-CheckTypeSize(struct timeval,8, 9858, 6, 1.2, NULL, 0, NULL)
-CheckMemberSize(struct timeval,tv_usec,4,6,33505)
-CheckOffset(struct timeval,tv_usec,4,6,33505)
-#elif defined __ia64__
-CheckTypeSize(struct timeval,16, 9858, 3, 1.3, NULL, 0, NULL)
-CheckMemberSize(struct timeval,tv_usec,8,3,33505)
-CheckOffset(struct timeval,tv_usec,8,3,33505)
-#elif defined __i386__
-CheckTypeSize(struct timeval,8, 9858, 2, 1.2, NULL, 0, NULL)
-CheckMemberSize(struct timeval,tv_usec,4,2,33505)
-CheckOffset(struct timeval,tv_usec,4,2,33505)
-#else
-Msg("Find size of timeval (9858)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.2""',NULL,0, NULL);\n",architecture,9858,0);
-#endif
-
extern int getitimer_db(__itimer_which_t, struct itimerval *);
CheckInterfacedef(getitimer,getitimer_db);
extern int setitimer_db(__itimer_which_t, const struct itimerval *, struct itimerval *);
=== modified file 'ts/devchk/time_h.c'
--- a/ts/devchk/time_h.c 2012-10-01 13:17:07 +0000
+++ b/ts/devchk/time_h.c 2013-02-06 19:54:55 +0000
@@ -310,7 +310,40 @@
CheckOffset(struct itimerspec,it_value,8,2,33509)
#else
Msg("Find size of itimerspec (10101)\n");
-Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.2""',NULL,0, NULL);\n",architecture,10101,0);
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.2""',NULL,0,NULL);\n",architecture,10101,0);
+#endif
+
+#if defined __s390x__
+CheckTypeSize(struct timespec,16, 7018, 12, 1.3, NULL, 0, NULL)
+CheckMemberSize(struct timespec,tv_nsec,8,12,33503)
+CheckOffset(struct timespec,tv_nsec,8,12,33503)
+#elif defined __x86_64__
+CheckTypeSize(struct timespec,16, 7018, 11, 2.0, NULL, 0, NULL)
+CheckMemberSize(struct timespec,tv_nsec,8,11,33503)
+CheckOffset(struct timespec,tv_nsec,8,11,33503)
+#elif defined __s390__ && !defined __s390x__
+CheckTypeSize(struct timespec,8, 7018, 10, 1.3, NULL, 0, NULL)
+CheckMemberSize(struct timespec,tv_nsec,4,10,33503)
+CheckOffset(struct timespec,tv_nsec,4,10,33503)
+#elif defined __powerpc64__
+CheckTypeSize(struct timespec,16, 7018, 9, 2.0, NULL, 0, NULL)
+CheckMemberSize(struct timespec,tv_nsec,8,9,33503)
+CheckOffset(struct timespec,tv_nsec,8,9,33503)
+#elif defined __powerpc__ && !defined __powerpc64__
+CheckTypeSize(struct timespec,8, 7018, 6, 1.2, NULL, 0, NULL)
+CheckMemberSize(struct timespec,tv_nsec,4,6,33503)
+CheckOffset(struct timespec,tv_nsec,4,6,33503)
+#elif defined __ia64__
+CheckTypeSize(struct timespec,16, 7018, 3, 1.3, NULL, 0, NULL)
+CheckMemberSize(struct timespec,tv_nsec,8,3,33503)
+CheckOffset(struct timespec,tv_nsec,8,3,33503)
+#elif defined __i386__
+CheckTypeSize(struct timespec,8, 7018, 2, 1.2, NULL, 0, NULL)
+CheckMemberSize(struct timespec,tv_nsec,4,2,33503)
+CheckOffset(struct timespec,tv_nsec,4,2,33503)
+#else
+Msg("Find size of timespec (7018)\n");
+Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""1.2""',NULL,0, NULL);\n",architecture,7018,0);
#endif
#if defined __i386__
=== modified file 'ts/devchk/unistd_h.c'
--- a/ts/devchk/unistd_h.c 2013-02-05 13:58:21 +0000
+++ b/ts/devchk/unistd_h.c 2013-02-06 19:54:55 +0000
@@ -2833,8 +2833,6 @@
CheckInterfacedef(lockf64,lockf64_db);
extern int nice_db(int);
CheckInterfacedef(nice,nice_db);
-extern int rename_db(const char *, const char *);
-CheckInterfacedef(rename,rename_db);
extern int setegid_db(gid_t);
CheckInterfacedef(setegid,setegid_db);
extern int seteuid_db(uid_t);
More information about the lsb-messages
mailing list