--- embedaddon/php/ext/standard/php_crypt_r.c	2012/02/21 23:48:02	1.1
+++ embedaddon/php/ext/standard/php_crypt_r.c	2014/06/15 20:03:57	1.1.1.4
@@ -1,9 +1,9 @@
-/* $Id: php_crypt_r.c,v 1.1 2012/02/21 23:48:02 misho Exp $ */
+/* $Id: php_crypt_r.c,v 1.1.1.4 2014/06/15 20:03:57 misho Exp $ */
 /*
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2012 The PHP Group                                |
+   | Copyright (c) 1997-2014 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -219,17 +219,12 @@ char * php_md5_crypt_r(const char *pw, const char *sal
 
 	memcpy(passwd, MD5_MAGIC, MD5_MAGIC_LEN);
 
-#if _MSC_VER >= 1500
 	if (strncpy_s(passwd + MD5_MAGIC_LEN, MD5_HASH_MAX_LEN - MD5_MAGIC_LEN, sp, sl + 1) != 0) {
 		goto _destroyCtx1;
 	}
 	passwd[MD5_MAGIC_LEN + sl] = '\0';
 	strcat_s(passwd, MD5_HASH_MAX_LEN, "$");
-#else
-	/* VC6 version doesn't have strcat_s or strncpy_s */
-	strncpy(passwd + MD5_MAGIC_LEN, sp, sl + 1);
-	strcat(passwd, "$");
-#endif
+
 	dwHashLen = 16;
 
 	/* Fetch the ctx hash value */