remove throw() from strnlen due to decl from system header. replace w…

…ith PAL_strnlen
dotnet · Sep 7, 2016 · 70f9195 · janvorli · Sep 7, 2016 · 70f9195
1 parent 14f441f
commit 70f9195
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/src/pal/inc/mbusafecrt.h b/src/pal/inc/mbusafecrt.h
@@ -65,7 +65,7 @@ extern WCHAR* wcstok_s( WCHAR* inString, const WCHAR* inControl, WCHAR** ioConte
 
 // strnlen is not required unless the source string is completely untrusted (e.g. anonymous input on a website)
 #ifndef SUPPRESS_STRNLEN
-    extern size_t strnlen( const char* inString, size_t inMaxSize );
+    extern size_t PAL_strnlen( const char* inString, size_t inMaxSize );
     extern size_t wcsnlen( const WCHAR* inString, size_t inMaxSize );
 #endif
 

diff --git a/src/pal/inc/pal.h b/src/pal/inc/pal.h
@@ -6953,4 +6953,5 @@ class NativeExceptionHolderFactory
 }
 #endif
 
+#define strnlen PAL_strnlen
 #endif // __PAL_H__
diff --git a/src/pal/src/include/pal/palinternal.h b/src/pal/src/include/pal/palinternal.h
@@ -169,7 +169,6 @@ function_name() to call the system's implementation
 #define memmove DUMMY_memmove 
 #define memchr DUMMY_memchr
 #define strlen DUMMY_strlen
-#define strnlen DUMMY_strnlen
 #define stricmp DUMMY_stricmp 
 #define strstr DUMMY_strstr 
 #define strcmp DUMMY_strcmp 

diff --git a/src/pal/src/safecrt/strlen_s.cpp b/src/pal/src/safecrt/strlen_s.cpp
@@ -42,7 +42,7 @@
 *
 *******************************************************************************/
 
-size_t __cdecl strnlen(const char *str, size_t maxsize) throw()
+size_t __cdecl PAL_strnlen(const char *str, size_t maxsize)
 {
     size_t n;
-Original file line number
+Diff line change
@@ Expand Up / @@ -6953,4 +6953,5 @@ class NativeExceptionHolderFactory @@
     }
     #endif
+    #define strnlen PAL_strnlen
     #endif // __PAL_H__