--- a/src/af/xap/xp/xap_Dialog.cpp
+++ b/src/af/xap/xp/xap_Dialog.cpp
@@ -267,7 +267,7 @@ XAP_Dialog_Modeless::BuildWindowName(cha
 // This function constructs and returns the window name of a modeless dialog by
 // concatenating the active frame with the dialog name
 
-	*pWindowName = (char) NULL;
+	*pWindowName = '\0';
 	UT_UTF8String wn = UT_UTF8String(pDialogName);
 
 	XAP_Frame* pFrame = getActiveFrame();
--- a/src/af/util/xp/t/ut_locale.t.cpp
+++ b/src/af/util/xp/t/ut_locale.t.cpp
@@ -29,6 +29,9 @@
 TFTEST_MAIN("UT_LocaleTransactor")
 {
 	char msg[128];
+#ifndef __GLIBC__
+	return;
+#endif
 	if (setlocale(LC_ALL, "fr_FR") == NULL)
 	{
 		printf("Test skipped, fr_FR locale is unknown on this system\n");
