3 files changed, 11 insertions, 11 deletions
diff --git a/src/pal/src/safecrt/cruntime.h b/src/pal/src/safecrt/cruntime.h
index cdad474e53..7341a388b6 100644
--- a/src/pal/src/safecrt/cruntime.h
+++ b/src/pal/src/safecrt/cruntime.h
@@ -36,11 +36,11 @@
 #endif  /* defined (_SYSCRT) && defined (_WIN64) */
 
 #if !defined (UNALIGNED)
-#if defined (_M_IA64) || defined (_M_AMD64)
+#if defined (_M_AMD64)
 #define UNALIGNED __unaligned
-#else  /* defined (_M_IA64) || defined (_M_AMD64) */
+#else  /* defined (_M_AMD64) */
 #define UNALIGNED
-#endif  /* defined (_M_IA64) || defined (_M_AMD64) */
+#endif  /* defined (_M_AMD64) */
 #endif  /* !defined (UNALIGNED) */
 
 #ifdef _M_IX86
@@ -57,9 +57,9 @@
 #define REG8
 #define REG9
 
-#elif defined (_M_IA64) || defined (_M_AMD64)
+#elif defined (_M_AMD64)
 /*
- * IA64
+ * AMD64
  */
 #define REG1    register
 #define REG2    register
@@ -71,7 +71,7 @@
 #define REG8    register
 #define REG9    register
 
-#else  /* defined (_M_IA64) || defined (_M_AMD64) */
+#else  /* defined (_M_AMD64) */
 
 #pragma message ("Machine register set not defined")
 
@@ -89,7 +89,7 @@
 #define REG8
 #define REG9
 
-#endif  /* defined (_M_IA64) || defined (_M_AMD64) */
+#endif  /* defined (_M_AMD64) */
 
 /*
  * Are the macro definitions below still needed in this file?
diff --git a/src/pal/src/safecrt/sscanf_s.cpp b/src/pal/src/safecrt/sscanf_s.cpp
index 4f548bccc6..7a481b580f 100644
--- a/src/pal/src/safecrt/sscanf_s.cpp
+++ b/src/pal/src/safecrt/sscanf_s.cpp
@@ -21,7 +21,7 @@
 
 typedef int (*INPUTFN)(miniFILE *, const unsigned char*, va_list);
 typedef int (*WINPUTFN)(miniFILE *, const wchar_t*, va_list);
-
+extern size_t PAL_wcsnlen(const WCHAR* inString, size_t inMaxSize);
 
 /***
 *static int v[nw]scan_fn([w]inputfn, string, [count], format, ...)
@@ -115,7 +115,7 @@ static int __cdecl vwscan_fn (
         miniFILE str;
         miniFILE *infile = &str;
         int retval;
-        size_t count = wcsnlen(string, INT_MAX);
+        size_t count = PAL_wcsnlen(string, INT_MAX);
 
         _VALIDATE_RETURN( (string != NULL), EINVAL, EOF);
         _VALIDATE_RETURN( (format != NULL), EINVAL, EOF);
@@ -149,7 +149,7 @@ static int __cdecl vnwscan_fn (
         miniFILE str;
         miniFILE *infile = &str;
         int retval;
-        size_t length = wcsnlen(string, INT_MAX);
+        size_t length = PAL_wcsnlen(string, INT_MAX);
 
         _VALIDATE_RETURN( (string != NULL), EINVAL, EOF);
         _VALIDATE_RETURN( (format != NULL), EINVAL, EOF);
diff --git a/src/pal/src/safecrt/wcslen_s.cpp b/src/pal/src/safecrt/wcslen_s.cpp
index 4fd5371035..0688148b5d 100644
--- a/src/pal/src/safecrt/wcslen_s.cpp
+++ b/src/pal/src/safecrt/wcslen_s.cpp
@@ -42,7 +42,7 @@
 *
 *******************************************************************************/
 
-size_t __cdecl wcsnlen(const wchar_t *wcs, size_t maxsize)
+size_t __cdecl PAL_wcsnlen(const wchar_t *wcs, size_t maxsize)
 {
     size_t n;