diff options
| author | Anatol Belski <ab@php.net> | 2014-01-22 11:53:32 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-01-22 11:53:32 +0100 |
| commit | e67ef24227d3fbd4a3ef0a44ada03fea2a6f5263 (patch) | |
| tree | a44bfb56856e25bd7306d8f05b48bcbd7427664a | |
| parent | fa224b1c58f7cea3632066cc86dcaa7b0cf74b24 (diff) | |
| parent | 7bcf01f39abcc0baab2b37ff9799581e9f298b10 (diff) | |
| download | php-git-e67ef24227d3fbd4a3ef0a44ada03fea2a6f5263.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fixed missing usleep() prototype in pgsql
| -rw-r--r-- | ext/pgsql/pgsql.c | 3 | ||||
| -rw-r--r-- | win32/time.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index cab87cf450..b37f40a8eb 100644 --- a/ext/pgsql/pgsql.c +++ b/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 diff --git a/win32/time.h b/win32/time.h index f841a2b601..d5d86eb1ed 100644 --- a/win32/time.h +++ b/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 |