diff --git a/configure b/configure
index 119a6b8e19..7dea45934a 100755
--- a/configure
+++ b/configure
@@ -29906,12 +29906,12 @@ if test "$WCSLEN_FOUND" = 1; then
 
 fi
 
-for ac_func in strnlen
+for ac_func in wcsftime
 do :
-  ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen"
-if test "x$ac_cv_func_strnlen" = xyes; then :
+  ac_fn_c_check_func "$LINENO" "wcsftime" "ac_cv_func_wcsftime"
+if test "x$ac_cv_func_wcsftime" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_STRNLEN 1
+#define HAVE_WCSFTIME 1
 _ACEOF
 
 fi
@@ -29919,7 +29919,7 @@ done
 
 
 if test "$wxUSE_MAC" != 1; then
-    for ac_func in wcsdup wcsftime wcsnlen wcscasecmp wcsncasecmp
+    for ac_func in strnlen wcsdup wcsnlen wcscasecmp wcsncasecmp
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
diff --git a/configure.in b/configure.in
index 6139892b0d..b6d30fa16b 100644
--- a/configure.in
+++ b/configure.in
@@ -4096,15 +4096,17 @@ if test "$WCSLEN_FOUND" = 1; then
     AC_DEFINE(HAVE_WCSLEN)
 fi
 
-AC_CHECK_FUNCS(strnlen)
+dnl Notice that unlike the functions below, this one seems to be present in all
+dnl support OS X versions so it's OK to test for it here.
+AC_CHECK_FUNCS(wcsftime)
 
-dnl OS X provides the wide character functions starting from 10.7 so our tests
-dnl would succeed if we're configuring under 10.7 or later, yet the compiled
-dnl programs would fail if ran under 10.6 or earlier. To avoid this problem we
-dnl define the corresponding HAVE_XXX in wx/osx/config_xcode.h instead of
-dnl testing for them here.
+dnl OS X provides the wide character functions (and also strnlen(), for some
+dnl reason) only starting from 10.7 so our tests would succeed if we're
+dnl configuring under 10.7 or later, yet the compiled programs would fail if
+dnl ran under 10.6 or earlier. To avoid this problem, define the corresponding
+dnl HAVE_XXX in wx/osx/config_xcode.h instead of testing for them here.
 if test "$wxUSE_MAC" != 1; then
-    AC_CHECK_FUNCS([wcsdup wcsftime wcsnlen wcscasecmp wcsncasecmp])
+    AC_CHECK_FUNCS([strnlen wcsdup wcsnlen wcscasecmp wcsncasecmp])
 fi
 
 dnl On HP-UX aCC need this define to find mbstrtowcs() &c
diff --git a/include/wx/osx/cocoa/chkconf.h b/include/wx/osx/cocoa/chkconf.h
index 09a16ab10e..d926cdfd88 100644
--- a/include/wx/osx/cocoa/chkconf.h
+++ b/include/wx/osx/cocoa/chkconf.h
@@ -12,6 +12,17 @@
 #ifndef _WX_OSX_COCOA_CHKCONF_H_
 #define _WX_OSX_COCOA_CHKCONF_H_
 
+/* Many wchar functions (and also strnlen(), for some reason) are only
+   available since 10.7 so don't use them if we want to build the applications
+   that would run under 10.6 and earlier. */
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7
+#define HAVE_STRNLEN 1
+#define HAVE_WCSDUP 1
+#define HAVE_WCSNLEN 1
+#define HAVE_WCSCASECMP 1
+#define HAVE_WCSNCASECMP 1
+#endif
+
 /*
  * native (1) or emulated (0) toolbar
  */
diff --git a/include/wx/osx/config_xcode.h b/include/wx/osx/config_xcode.h
index 006fef025b..0174f32707 100644
--- a/include/wx/osx/config_xcode.h
+++ b/include/wx/osx/config_xcode.h
@@ -74,17 +74,6 @@
 #define HAVE_VSSCANF_DECL 1
 #define HAVE_USLEEP 1
 #define HAVE_WCSLEN 1
-
-/* Many wchar functions are only available since 10.7 so don't use them if we
-   want to build the applications that would run under 10.6 and earlier. */
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7
-#define HAVE_WCSDUP 1
-#define HAVE_WCSFTIME 1
-#define HAVE_WCSNLEN 1
-#define HAVE_WCSCASECMP 1
-#define HAVE_WCSNCASECMP 1
-#endif
-
 #define SIZEOF_WCHAR_T 4
 #define SIZEOF_SHORT 2
 #define SIZEOF_INT 4