Avoid C++-reserved keyword "private" in bits/semaphore.h

Author: th-otto

include/bits/semaphore.h

@@ -28,5 +28,5 @@ typedef struct
 	unsigned long value;
 	unsigned long nwaiters;
 	unsigned long sem_id;
-	unsigned long private;
+	unsigned long __private;
 } sem_t;

posix/sem_init.c

@@ -35,7 +35,7 @@ int sem_init(sem_t *sem, int pshared, unsigned int value)
 		return -1;
 	}
 	/* pshared is currently unused */
-	sem->private = pshared ? 1 : 0;
+	sem->__private = pshared ? 1 : 0;
 	/* Use the values the caller provided.  */
 	sem->value = value << SEM_VALUE_SHIFT;
 	sem->nwaiters = 0;

posix/sem_open.c

@@ -28,5 +28,5 @@ static inline void __sem_open_init(struct new_sem *sem, unsigned value)
 	sem->nwaiters = 0;
 
 	/* This always is a shared semaphore.  */
-	sem->private = 1;
+	sem->__private = 1;
 }

posix/sem_post.c

@@ -28,7 +28,7 @@ int sem_post(sem_t *sem)
 	/* If there is any potentially blocked waiter, wake one of them.  */
 #if 0
 	if ((v & SEM_NWAITERS_MASK) != 0)
-		futex_wake(&sem->value, 1, sem->private);
+		futex_wake(&sem->value, 1, sem->__private);
 #endif
 	ret = Psemaphore(3, sem->sem_id, 0);
 	if (ret < 0)

posix/sem_waitcommon.c

@@ -138,7 +138,7 @@ static void __sem_wait_finish(sem_t *sem)
 		v >>= SEM_VALUE_SHIFT;
 #if 0
 		if (v > 0)
-			futex_wake(&sem->value, v, sem->private);
+			futex_wake(&sem->value, v, sem->__private);
 #endif
 	}
 }
@@ -163,7 +163,7 @@ static int __attribute__((noinline)) do_futex_wait(sem_t *sem, clockid_t clockid
 	int err;
 
 #if 0
-	err = __futex_abstimed_wait_cancelable64(&sem->value, SEM_NWAITERS_MASK, clockid, abstime, sem->private);
+	err = __futex_abstimed_wait_cancelable64(&sem->value, SEM_NWAITERS_MASK, clockid, abstime, sem->__private);
 #else
 	if (abstime)
 	{