[Lsb-messages] /var/www/bzr/lsb/devel/devchk r2314: more fixes from bug 3548

[Mats Wichmann]

------------------------------------------------------------
revno: 2314
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: devchk
timestamp: Thu 2012-10-25 15:24:06 -0600
message:
  more fixes from bug 3548
modified:
  ts/devchk/ffi_h.c
  ts/devchk/ffitarget_h.c
  ts/devchk/glib_2_0_glib_h.c
-------------- next part --------------
=== modified file 'ts/devchk/ffi_h.c'
--- a/ts/devchk/ffi_h.c	2012-10-19 18:19:28 +0000
+++ b/ts/devchk/ffi_h.c	2012-10-25 21:24:06 +0000
@@ -28,6 +28,40 @@
 stripped_macro_value=(char*)malloc( (MAX_VALUE_LENGTH+1)*sizeof(char) );
 
 Msg("Checking data structures in ffi.h\n");
+#if _LSB_DEFAULT_ARCH
+#ifdef FFI_64_BIT_MAX
+	CompareLimitConstant(FFI_64_BIT_MAX,9223372036854775807,22058,architecture,5.0,NULL)
+#else
+Msg( "Error: Constant not found: FFI_64_BIT_MAX\n");
+cnt++;
+#endif
+
+#endif
+
+#if _LSB_DEFAULT_ARCH
+#ifdef FFI_SIZEOF_ARG
+	CompareLimitConstant(FFI_SIZEOF_ARG,4,22059,architecture,5.0,NULL)
+#else
+Msg( "Error: Constant not found: FFI_SIZEOF_ARG\n");
+cnt++;
+#endif
+
+#endif
+
+#if _LSB_DEFAULT_ARCH
+#ifdef FFI_SIZEOF_JAVA_RAW
+	CompareLimitConstant(FFI_SIZEOF_JAVA_RAW,FFI_SIZEOF_ARG,22060,architecture,5.0,NULL)
+#else
+Msg( "Error: Constant not found: FFI_SIZEOF_JAVA_RAW\n");
+cnt++;
+#endif
+
+#endif
+
+#if _LSB_DEFAULT_ARCH
+/* No test for ffi.h depends on limits.h */
+#endif
+
 #if 1
 CheckTypeSize(struct _ffi_type,0, 41188, 1, , NULL, 0, NULL)
 Msg("Missing member data for _ffi_type on All\n");
@@ -123,22 +157,22 @@
 CheckInterfacedef(ffi_closure_alloc,ffi_closure_alloc_db);
 extern void ffi_closure_free_db(void *);
 CheckInterfacedef(ffi_closure_free,ffi_closure_free_db);
-extern ffi_status ffi_prep_closure_db(struct ffi_closure *, struct ffi_cif *, void(*fptr2)(void)
+extern ffi_status ffi_prep_closure_db(struct ffi_closure *, struct ffi_cif *, void(*fptr2)(struct ffi_cif *,void *,void * *,void *)
 , void *);
 CheckInterfacedef(ffi_prep_closure,ffi_prep_closure_db);
-extern ffi_status ffi_prep_closure_loc_db(struct ffi_closure *, struct ffi_cif *, void(*fptr3)(void)
+extern ffi_status ffi_prep_closure_loc_db(struct ffi_closure *, struct ffi_cif *, void(*fptr3)(struct ffi_cif *,void *,void * *,void *)
 , void *, void *);
 CheckInterfacedef(ffi_prep_closure_loc,ffi_prep_closure_loc_db);
-extern ffi_status ffi_prep_raw_closure_db(struct ffi_raw_closure *, struct ffi_cif *, void(*fptr4)(void)
+extern ffi_status ffi_prep_raw_closure_db(struct ffi_raw_closure *, struct ffi_cif *, void(*fptr4)(struct ffi_cif *,void *,union ffi_raw *,void *)
 , void *);
 CheckInterfacedef(ffi_prep_raw_closure,ffi_prep_raw_closure_db);
-extern ffi_status ffi_prep_raw_closure_loc_db(struct ffi_raw_closure *, struct ffi_cif *, void(*fptr5)(void)
+extern ffi_status ffi_prep_raw_closure_loc_db(struct ffi_raw_closure *, struct ffi_cif *, void(*fptr5)(struct ffi_cif *,void *,union ffi_raw *,void *)
 , void *, void *);
 CheckInterfacedef(ffi_prep_raw_closure_loc,ffi_prep_raw_closure_loc_db);
-extern ffi_status ffi_prep_java_raw_closure_db(struct ffi_java_raw_closure *, struct ffi_cif *, void(*fptr6)(void)
+extern ffi_status ffi_prep_java_raw_closure_db(struct ffi_java_raw_closure *, struct ffi_cif *, void(*fptr6)(struct ffi_cif *,void *,ffi_java_raw *,void *)
 , void *);
 CheckInterfacedef(ffi_prep_java_raw_closure,ffi_prep_java_raw_closure_db);
-extern ffi_status ffi_prep_java_raw_closure_loc_db(struct ffi_java_raw_closure *, struct ffi_cif *, void(*fptr7)(void)
+extern ffi_status ffi_prep_java_raw_closure_loc_db(struct ffi_java_raw_closure *, struct ffi_cif *, void(*fptr7)(struct ffi_cif *,void *,ffi_java_raw *,void *)
 , void *, void *);
 CheckInterfacedef(ffi_prep_java_raw_closure_loc,ffi_prep_java_raw_closure_loc_db);
 extern ffi_status ffi_prep_cif_db(struct ffi_cif *, ffi_abi, unsigned int, ffi_type *, ffi_type * *);

=== modified file 'ts/devchk/ffitarget_h.c'
--- a/ts/devchk/ffitarget_h.c	2012-10-19 18:19:28 +0000
+++ b/ts/devchk/ffitarget_h.c	2012-10-25 21:24:06 +0000
@@ -28,6 +28,24 @@
 stripped_macro_value=(char*)malloc( (MAX_VALUE_LENGTH+1)*sizeof(char) );
 
 Msg("Checking data structures in ffitarget.h\n");
+#if defined __x86_64__
+#ifdef FFI_TRAMPOLINE_SIZE
+	CompareLimitConstant(FFI_TRAMPOLINE_SIZE,24,22057,architecture,5.0,NULL)
+#else
+Msg( "Error: Constant not found: FFI_TRAMPOLINE_SIZE\n");
+cnt++;
+#endif
+
+#elif _LSB_DEFAULT_ARCH
+#ifdef FFI_TRAMPOLINE_SIZE
+	CompareLimitConstant(FFI_TRAMPOLINE_SIZE,10,22057,architecture,5.0,NULL)
+#else
+Msg( "Error: Constant not found: FFI_TRAMPOLINE_SIZE\n");
+cnt++;
+#endif
+
+#endif
+
 #if 1
 CheckTypeSize(ffi_arg,0, 41181, 1, 5.0, NULL, 9, NULL)
 #endif

=== modified file 'ts/devchk/glib_2_0_glib_h.c'
--- a/ts/devchk/glib_2_0_glib_h.c	2012-10-24 14:52:58 +0000
+++ b/ts/devchk/glib_2_0_glib_h.c	2012-10-25 21:24:06 +0000
@@ -12899,15 +12899,15 @@
 CheckInterfacedef(g_variant_new,g_variant_new_db);
 extern void g_variant_get_db(GVariant *, const gchar *, ...);
 CheckInterfacedef(g_variant_get,g_variant_get_db);
-extern GVariant * g_variant_new_va_db(const gchar *, const gchar * *, struct __va_list_tag *[]);
+extern GVariant * g_variant_new_va_db(const gchar *, const gchar * *, va_list *);
 CheckInterfacedef(g_variant_new_va,g_variant_new_va_db);
-extern void g_variant_get_va_db(GVariant *, const gchar *, const gchar * *, struct __va_list_tag *[]);
+extern void g_variant_get_va_db(GVariant *, const gchar *, const gchar * *, va_list *);
 CheckInterfacedef(g_variant_get_va,g_variant_get_va_db);
 extern GVariant * g_variant_parse_db(const GVariantType *, const char *, const char *, const char * *, GError * *);
 CheckInterfacedef(g_variant_parse,g_variant_parse_db);
 extern GVariant * g_variant_new_parsed_db(const gchar *, ...);
 CheckInterfacedef(g_variant_new_parsed,g_variant_new_parsed_db);
-extern GVariant * g_variant_new_parsed_va_db(const gchar *, struct __va_list_tag *[]);
+extern GVariant * g_variant_new_parsed_va_db(const gchar *, va_list *);
 CheckInterfacedef(g_variant_new_parsed_va,g_variant_new_parsed_va_db);
 extern gint g_variant_compare_db(gconstpointer, gconstpointer);
 CheckInterfacedef(g_variant_compare,g_variant_compare_db);
@@ -13213,8 +13213,6 @@
 CheckInterfacedef(g_string_append_vprintf,g_string_append_vprintf_db);
 extern GString * g_string_append_uri_escaped_db(GString *, const gchar *, const gchar *, gboolean);
 CheckInterfacedef(g_string_append_uri_escaped,g_string_append_uri_escaped_db);
-extern GString * g_string_append_c_inline_db(GString *, gchar);
-CheckInterfacedef(g_string_append_c_inline,g_string_append_c_inline_db);
 extern GString * g_string_down_db(GString *);
 CheckInterfacedef(g_string_down,g_string_down_db);
 extern GString * g_string_up_db(GString *);