From 6e5a3c6876f1e165c7ed33b5470d30cfd82af388 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Mon, 12 Sep 2005 23:24:38 +0000
Subject: [PATCH] Use XP_ prefix on SEM macros to avoid conflicts.
---
src/xpdev/xpsem.c | 6 +++---
src/xpdev/xpsem.h | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/xpdev/xpsem.c b/src/xpdev/xpsem.c
index 43ad2a29c9..387ce2d915 100644
--- a/src/xpdev/xpsem.c
+++ b/src/xpdev/xpsem.c
@@ -57,7 +57,7 @@ xp_sem_init(xp_sem_t *sem, int pshared, unsigned int value)
goto RETURN;
}
- if (value > SEM_VALUE_MAX) {
+ if (value > XP_SEM_VALUE_MAX) {
errno = EINVAL;
retval = -1;
goto RETURN;
@@ -90,7 +90,7 @@ xp_sem_init(xp_sem_t *sem, int pshared, unsigned int value)
(*sem)->count = (u_int32_t)value;
(*sem)->nwaiters = 0;
- (*sem)->magic = SEM_MAGIC;
+ (*sem)->magic = XP_SEM_MAGIC;
retval = 0;
RETURN:
@@ -129,7 +129,7 @@ xp_sem_t *
xp_sem_open(const char *name, int oflag, ...)
{
errno = ENOSYS;
- return SEM_FAILED;
+ return XP_SEM_FAILED;
}
int
diff --git a/src/xpdev/xpsem.h b/src/xpdev/xpsem.h
index 3b6da7e626..81124b5a15 100644
--- a/src/xpdev/xpsem.h
+++ b/src/xpdev/xpsem.h
@@ -51,8 +51,8 @@
struct xp_sem;
typedef struct xp_sem *xp_sem_t;
-#define SEM_FAILED ((xp_sem_t *)0)
-#define SEM_VALUE_MAX UINT_MAX
+#define XP_SEM_FAILED ((xp_sem_t *)0)
+#define XP_SEM_VALUE_MAX UINT_MAX
#if defined(__solaris__)
typedef unsigned int u_int32_t;
@@ -88,7 +88,7 @@ int xp_sem_timedwait (xp_sem_t *sem, const struct timespec *abs_timeout);
*/
struct xp_sem {
-#define SEM_MAGIC ((u_int32_t) 0x09fa4012)
+#define XP_SEM_MAGIC ((u_int32_t) 0x09fa4012)
u_int32_t magic;
pthread_mutex_t lock;
pthread_cond_t gtzero;
@@ -105,7 +105,7 @@ extern void _thread_init (void);
(_threads_initialized != 0)
#define _SEM_CHECK_VALIDITY(sem) \
- if (sem==NULL || (*(sem))->magic != SEM_MAGIC) { \
+ if (sem==NULL || (*(sem))->magic != XP_SEM_MAGIC) { \
errno = EINVAL; \
retval = -1; \
goto RETURN; \
--
GitLab