Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed missing usleep() prototype in pgsql

Author: weltling

ext/pgsql/pgsql.c

@@ -37,6 +37,9 @@
 #include "ext/standard/php_standard.h"
 #include "ext/standard/php_smart_str.h"
 #include "ext/ereg/php_regex.h"
+#ifdef PHP_WIN32
+# include "win32/time.h"
+#endif
 
 #undef PACKAGE_BUGREPORT
 #undef PACKAGE_NAME

win32/time.h

@@ -50,4 +50,6 @@ PHPAPI extern int setitimer(int which, const struct itimerval *value,
 
 PHPAPI int nanosleep( const struct timespec * rqtp, struct timespec * rmtp );
 
+PHPAPI int usleep(unsigned int useconds);
+
 #endif