[Lsb-messages] /var/www/bzr/lsb/devel/devchk r2312: another set of fixes, plus const deprecations, from bug 3548

[Mats Wichmann]

------------------------------------------------------------
revno: 2312
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: devchk
timestamp: Wed 2012-10-24 08:35:00 -0600
message:
  another set of fixes, plus const deprecations, from bug 3548
modified:
  ts/devchk/glib_2_0_glib_h.c
-------------- next part --------------
=== modified file 'ts/devchk/glib_2_0_glib_h.c'
--- a/ts/devchk/glib_2_0_glib_h.c	2012-10-19 18:19:28 +0000
+++ b/ts/devchk/glib_2_0_glib_h.c	2012-10-24 14:35:00 +0000
@@ -1387,25 +1387,16 @@
 
 #endif
 
-#if defined __powerpc64__
-/* No test for G_STATIC_MUTEX_INIT */
-#elif defined __powerpc__ && !defined __powerpc64__
-/* No test for G_STATIC_MUTEX_INIT */
-#elif defined __ia64__
-/* No test for G_STATIC_MUTEX_INIT */
-#elif defined __i386__
-/* No test for G_STATIC_MUTEX_INIT */
-#elif defined __s390x__
-/* No test for G_STATIC_MUTEX_INIT */
-#elif defined __x86_64__
-/* No test for G_STATIC_MUTEX_INIT */
-#elif defined __s390__ && !defined __s390x__
-/* No test for G_STATIC_MUTEX_INIT */
-#else
-Msg( "No definition for G_STATIC_MUTEX_INIT (5872, literal) in db for this architecture\n");
+#if _LSB_DEFAULT_ARCH
 #ifdef G_STATIC_MUTEX_INIT
-#endif
-#endif
+	CompareMacro(G_STATIC_MUTEX_INIT,{NULL},{ NULL },5872,architecture,5.0,NULL)
+#else
+Msg( "Error: Constant not found: G_STATIC_MUTEX_INIT\n");
+cnt++;
+#endif
+
+#endif
+
 #if _LSB_DEFAULT_ARCH
 /* No test for g_static_mutex_get_mutex(mutex) */
 #endif
@@ -4324,6 +4315,10 @@
 CheckOffset(struct _GStaticRecMutex,unused,0,1,222995)
 #endif
 
+#if 1
+CheckTypeSize(GMutex,0, 11511, 1, 5.0, NULL, 41134, NULL)
+#endif
+
 #if defined __s390x__
 CheckTypeSize(union _GSystemThread,8, 11512, 12, , NULL, 0, NULL)
 Msg("Missing member data for _GSystemThread on S390X\n");
@@ -7237,6 +7232,10 @@
 Sql("REPLACE INTO ArchType VALUES (%d,%d,%d,'""3.1""',NULL,11701,NULL);\n",architecture,11702,0);
 #endif
 
+#if 1
+CheckTypeSize(GStaticMutex,0, 11703, 1, 5.0, NULL, 41146, NULL)
+#endif
+
 #if defined __s390x__
 CheckTypeSize(struct _GStaticPrivate,4, 11706, 12, , NULL, 0, NULL)
 Msg("Missing member data for _GStaticPrivate on S390X\n");
@@ -8977,12 +8976,6 @@
 #endif
 
 #if 1
-CheckTypeSize(struct GStaticMutex,0, 41147, 1, 5.0, NULL, 0, NULL)
-Msg("Missing member data for GStaticMutex on All\n");
-CheckOffset(struct GStaticMutex,mutex,0,1,222989)
-#endif
-
-#if 1
 CheckTypeSize(GTimeSpan,0, 41164, 1, 5.0, NULL, 11533, NULL)
 #endif
 
@@ -13104,7 +13097,7 @@
 CheckInterfacedef(g_key_file_get_uint64,g_key_file_get_uint64_db);
 extern void g_key_file_set_uint64_db(GKeyFile *, const gchar *, const gchar *, guint64);
 CheckInterfacedef(g_key_file_set_uint64,g_key_file_set_uint64_db);
-extern GError * g_error_new_valist_db(GQuark, gint, const gchar *, void);
+extern GError * g_error_new_valist_db(GQuark, gint, const gchar *, va_list);
 CheckInterfacedef(g_error_new_valist,g_error_new_valist_db);
 extern void g_set_error_literal_db(GError * *, GQuark, gint, const gchar *);
 CheckInterfacedef(g_set_error_literal,g_set_error_literal_db);
@@ -13210,9 +13203,9 @@
 CheckInterfacedef(g_string_overwrite,g_string_overwrite_db);
 extern GString * g_string_overwrite_len_db(GString *, gsize, const gchar *, gssize);
 CheckInterfacedef(g_string_overwrite_len,g_string_overwrite_len_db);
-extern void g_string_vprintf_db(GString *, const gchar *, void);
+extern void g_string_vprintf_db(GString *, const gchar *, va_list);
 CheckInterfacedef(g_string_vprintf,g_string_vprintf_db);
-extern void g_string_append_vprintf_db(GString *, const gchar *, void);
+extern void g_string_append_vprintf_db(GString *, const gchar *, va_list);
 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);
@@ -13268,9 +13261,8 @@
 CheckInterfacedef(g_get_codeset,g_get_codeset_db);
 extern gchar * * g_get_locale_variants_db(const gchar *);
 CheckInterfacedef(g_get_locale_variants,g_get_locale_variants_db);
-guint64(*fptr0)(void)
- g_thread_gettime_db ;
-CheckGlobalVar(g_thread_gettime_db, g_thread_gettime);
+extern guint64 * g_thread_gettime_db(void);
+CheckInterfacedef(g_thread_gettime,g_thread_gettime_db);
 #ifdef TET_TEST
 if (pcnt == cnt )
 	tet_result(TET_PASS);