almost trivial fixes to get it worky on windows

Author: weltling

crypto/crypto_scrypt-nosse.c

@@ -33,7 +33,11 @@
 #endif
 
 #include <errno.h>
-#include <stdint.h>
+#ifdef PHP_WIN32
+# include "win32/php_stdint.h"
+#else
+# include <stdint.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 

crypto/crypto_scrypt.h

@@ -29,7 +29,11 @@
 #ifndef _CRYPTO_SCRYPT_H_
 #define _CRYPTO_SCRYPT_H_
 
-#include <stdint.h>
+#ifdef PHP_WIN32
+# include "win32/php_stdint.h"
+#else
+# include <stdint.h>
+#endif
 
 /**
  * crypto_scrypt(passwd, passwdlen, salt, saltlen, N, r, p, buf, buflen):

crypto/params.c

@@ -28,12 +28,19 @@
  */
 
 #include <stddef.h>
-#include <stdint.h>
-#include <unistd.h>
+#ifdef PHP_WIN32
+# include "win32/time.h"
+# include "win32/php_stdint.h"
+#else
+# include <stdint.h>
+# include <unistd.h>
+#endif
 #include <errno.h>
 #include <time.h>
-#include <sys/time.h>
-#include <sys/resource.h>
+#ifndef PHP_WIN32
+# include <sys/time.h>
+# include <sys/resource.h>
+#endif
 #include <sys/types.h>
 
 #ifdef HAVE_CONFIG_H
@@ -392,6 +399,13 @@ memlimit_sysinfo(size_t * memlimit)
 }
 #endif /* HAVE_SYSINFO */
 
+#ifdef _WIN32
+static int
+memlimit_rlimit(size_t * memlimit)
+{
+        return (0);
+}
+#else
 static int
 memlimit_rlimit(size_t * memlimit)
 {
@@ -441,6 +455,7 @@ memlimit_rlimit(size_t * memlimit)
     /* Success! */
     return (0);
 }
+#endif
 
 #ifdef _SC_PHYS_PAGES
 
@@ -555,4 +570,4 @@ memtouse(size_t maxmem, double maxmemfrac, size_t * memlimit)
     /* Return limit via the provided pointer. */
     *memlimit = memavail;
     return (0);
-}
+}

crypto/sha256.c

@@ -27,7 +27,11 @@
 #include "php.h"
 
 #include <sys/types.h>
-#include <stdint.h>
+#ifdef PHP_WIN32
+# include "win32/php_stdint.h"
+#else
+# include <stdint.h>
+#endif
 #include <string.h>
 
 #include "sysendian.h"

crypto/sha256.h

@@ -31,7 +31,11 @@
 
 #include <sys/types.h>
 
-#include <stdint.h>
+#ifdef PHP_WIN32
+# include "win32/php_stdint.h"
+#else
+# include <stdint.h>
+#endif
 
 typedef struct SHA256Context {
     uint32_t state[8];

crypto/sysendian.h

@@ -40,7 +40,11 @@
 
 #else
 
-#include <stdint.h>
+#ifdef PHP_WIN32
+# include "win32/php_stdint.h"
+#else
+# include <stdint.h>
+#endif
 
 static inline uint32_t
 be32dec(const void *pp)

php_scrypt.c

@@ -50,20 +50,16 @@ ZEND_BEGIN_ARG_INFO_EX(scrypt_arginfo, 0, 0, 6)
     ZEND_ARG_INFO(0, keyLength)
 ZEND_END_ARG_INFO()
 
-#ifndef PHP_WIN32
 ZEND_BEGIN_ARG_INFO_EX(scrypt_pickparams_arginfo, 0, 0, 3)
     ZEND_ARG_INFO(0, maxMemory)
     ZEND_ARG_INFO(0, memFraction)
     ZEND_ARG_INFO(0, maxTime)
 ZEND_END_ARG_INFO()
-#endif
 /* }}} */
 
 static zend_function_entry scrypt_functions[] = {
     PHP_FE(scrypt, scrypt_arginfo)
-#ifndef PHP_WIN32
     PHP_FE(scrypt_pickparams, scrypt_pickparams_arginfo)
-#endif
     {NULL, NULL, NULL}
 };
 
@@ -205,7 +201,6 @@ PHP_FUNCTION(scrypt)
 }
 /* }}} */
 
-#ifndef PHP_WIN32
 /* {{{ proto array scrypt_pickparams(long maxMemory, double memFraction, double maxTime)
  * Returns N, r and p picked automatically for use with the scrypt function.
  *
@@ -258,4 +253,3 @@ PHP_FUNCTION(scrypt_pickparams)
     return;
 }
 /* }}} */
-#endif

php_scrypt.h

@@ -30,11 +30,9 @@
 #define PHP_SCRYPT_EXTNAME "scrypt"
 
 PHP_FUNCTION(scrypt);
-#ifndef PHP_WIN32
 PHP_FUNCTION(scrypt_pickparams);
-#endif
 
 extern zend_module_entry scrypt_module_entry;
 #define phpext_scrypt_ptr &scrypt_module_entry
 
-#endif
+#endif

php_scrypt_utils.h

@@ -35,7 +35,11 @@
 #include "zend_config.w32.h"
 #endif
 #include "php.h"
-#include <stdint.h>
+#ifdef PHP_WIN32
+# include "win32/php_stdint.h"
+#else
+# include <stdint.h>
+#endif
 
 /*
  * Casts a long into a uint64_t.
@@ -57,4 +61,4 @@ clampAndCast64(const char *variableName, long value, int *error);
 uint32_t
 clampAndCast32(const char *variableName, long value, int *error);
 
-#endif
+#endif