summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-05-17 09:07:07 +0000
committerLennart Poettering <lennart@poettering.net>2008-05-17 09:07:07 +0000
commit85d9abea8a6ae8582a6e01ba1ca3d040cf833f5b (patch)
tree4c4459743fa052c297dbf297cb5c1212f936cb41 /src
parentb8849f5c2f41bca88459639b3216059a2f071515 (diff)
declare the explicit type for our PA_xSEC_PER_ySEC constants
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2448 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src')
-rw-r--r--src/pulse/timeval.c2
-rw-r--r--src/pulse/timeval.h12
2 files changed, 7 insertions, 7 deletions
diff --git a/src/pulse/timeval.c b/src/pulse/timeval.c
index 180e0159..7a19638d 100644
--- a/src/pulse/timeval.c
+++ b/src/pulse/timeval.c
@@ -140,7 +140,7 @@ struct timeval* pa_timeval_add(struct timeval *tv, pa_usec_t v) {
tv->tv_usec += (suseconds_t) v;
/* Normalize */
- while (tv->tv_usec >= PA_USEC_PER_SEC) {
+ while ((unsigned) tv->tv_usec >= PA_USEC_PER_SEC) {
tv->tv_sec++;
tv->tv_usec -= PA_USEC_PER_SEC;
}
diff --git a/src/pulse/timeval.h b/src/pulse/timeval.h
index 09d53974..2e9e3ca3 100644
--- a/src/pulse/timeval.h
+++ b/src/pulse/timeval.h
@@ -34,12 +34,12 @@
PA_C_DECL_BEGIN
-#define PA_MSEC_PER_SEC 1000
-#define PA_USEC_PER_SEC 1000000
-#define PA_NSEC_PER_SEC 1000000000
-#define PA_USEC_PER_MSEC 1000
-#define PA_NSEC_PER_MSEC 1000000
-#define PA_NSEC_PER_USEC 1000
+#define PA_MSEC_PER_SEC ((pa_usec_t) 1000ULL)
+#define PA_USEC_PER_SEC ((pa_usec_t) 1000000ULL)
+#define PA_NSEC_PER_SEC ((pa_usec_t) 1000000000ULL)
+#define PA_USEC_PER_MSEC ((pa_usec_t) 1000ULL)
+#define PA_NSEC_PER_MSEC ((pa_usec_t) 1000000ULL)
+#define PA_NSEC_PER_USEC ((pa_usec_t) 1000ULL)
struct timeval;