|
Check-in Number:
|
5995 | |
| Date: |
2008-Mar-07 10:28:14 (local)
2008-Mar-07 09:28:14 (UTC) |
| User: | rse |
| Branch: | |
| Comment: |
Resolve namespace conflicts of recently introduced time_xxx()
functions by using a propoer "uuid_" prefix. |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/uuid/ChangeLog 1.156 -> 1.157
--- ChangeLog 2008/03/06 12:14:49 1.156
+++ ChangeLog 2008/03/07 09:28:14 1.157
@@ -13,6 +13,10 @@
Changes between 1.6.1 and 1.6.2 (21-Feb-2008 to 06-Mar-2008)
+ o Resolve namespace conflicts of recently introduced time_xxx()
+ functions by using a propoer "uuid_" prefix.
+ [Ralf S. Engelschall]
+
o Remove unused "struct timezone" from time_gettimeofday() in
order to simplify portability.
[Ralf S. Engelschall]
|
|
ossp-pkg/uuid/uuid_time.h 1.3 -> 1.4
--- uuid_time.h 2008/03/06 12:14:49 1.3
+++ uuid_time.h 2008/03/07 09:28:15 1.4
@@ -44,6 +44,21 @@
#include <sys/types.h>
#endif
+#define TIME_PREFIX uuid_
+
+/* embedding support */
+#ifdef TIME_PREFIX
+#if defined(__STDC__) || defined(__cplusplus)
+#define __TIME_CONCAT(x,y) x ## y
+#define TIME_CONCAT(x,y) __TIME_CONCAT(x,y)
+#else
+#define __TIME_CONCAT(x) x
+#define TIME_CONCAT(x,y) __TIME_CONCAT(x)y
+#endif
+#define time_gettimeofday TIME_CONCAT(TIME_PREFIX,time_gettimeofday)
+#define time_usleep TIME_CONCAT(TIME_PREFIX,time_usleep)
+#endif
+
#ifndef HAVE_STRUCT_TIMEVAL
struct timeval { long tv_sec; long tv_usec; };
#endif
|
|
