com php-src: fix preprocessor conditions: win32/time.h
| From: | Anatol Belski | Date: | Thu, 06 Nov 2014 13:03:42 +0000 |
| Subject: | com php-src: fix preprocessor conditions: win32/time.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82954@lists.php.net to get a copy of this message | ||
Commit: f2ad1fb3c9ba90217cfc00dc57a2b5a99c21fdff
Author: Anatol Belski <ab@php.net> Thu, 6 Nov 2014 14:03:42 +0100
Parents: bea7d06b79187692a3c4ec7f34e41e017b359e5d
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f2ad1fb3c9ba90217cfc00dc57a2b5a99c21fdff
Log:
fix preprocessor conditions
Changed paths:
M win32/time.h
Diff:
diff --git a/win32/time.h b/win32/time.h
index c6679b6..8f39c04 100644
--- a/win32/time.h
+++ b/win32/time.h
@@ -28,15 +28,13 @@ struct itimerval {
struct timeval it_value; /* current value */
};
-#ifndef timespec
-#if _MSC_VER < 1900
+#if !defined(timespec) && _MSC_VER < 1900
struct timespec
{
time_t tv_sec; /* seconds */
long tv_nsec; /* nanoseconds */
};
#endif
-#endif
#define ITIMER_REAL 0 /*generates sigalrm */
#define ITIMER_VIRTUAL 1 /*generates sigvtalrm */