diff options
| author | ad <ad@NetBSD.org> | 2008-11-14 15:49:20 +0000 |
|---|---|---|
| committer | ad <ad@NetBSD.org> | 2008-11-14 15:49:20 +0000 |
| commit | 18e73e1ebe8e2ecf59451e8d4bfaf3d602ccea27 (patch) | |
| tree | 72d03f7eeded94b859cc79338127c9a995f84d40 /lib | |
| parent | a44212844f21fcf42b0f1578f378e10ef19ffdf4 (diff) | |
Replace semid_t with intptr_t. No function change. This is a libc/kernel
private interface and so the name change should not affect any third
party code.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libpthread/sem.c | 14 | ||||
| -rw-r--r-- | lib/librt/sem.c | 16 |
2 files changed, 15 insertions, 15 deletions
diff --git a/lib/libpthread/sem.c b/lib/libpthread/sem.c index 2ad858a0e09..fe219f7683a 100644 --- a/lib/libpthread/sem.c +++ b/lib/libpthread/sem.c @@ -1,4 +1,4 @@ -/* $NetBSD: sem.c,v 1.20 2008/04/28 20:23:02 martin Exp $ */ +/* $NetBSD: sem.c,v 1.21 2008/11/14 15:49:20 ad Exp $ */ /*- * Copyright (c) 2003, 2006, 2007 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: sem.c,v 1.20 2008/04/28 20:23:02 martin Exp $"); +__RCSID("$NetBSD: sem.c,v 1.21 2008/11/14 15:49:20 ad Exp $"); #include <sys/types.h> #include <sys/ksem.h> @@ -78,7 +78,7 @@ struct _sem_st { #define USEM_MAGIC 0x09fa4012 LIST_ENTRY(_sem_st) usem_list; - semid_t usem_semid; /* 0 -> user (non-shared) */ + intptr_t usem_semid; /* 0 -> user (non-shared) */ #define USEM_USER 0 /* assumes kernel does not use NULL */ sem_t *usem_identity; @@ -88,7 +88,7 @@ struct _sem_st { unsigned int usem_count; }; -static int sem_alloc(unsigned int value, semid_t semid, sem_t *semp); +static int sem_alloc(unsigned int value, intptr_t semid, sem_t *semp); static void sem_free(sem_t sem); static LIST_HEAD(, _sem_st) named_sems = LIST_HEAD_INITIALIZER(&named_sems); @@ -107,7 +107,7 @@ sem_free(sem_t sem) } static int -sem_alloc(unsigned int value, semid_t semid, sem_t *semp) +sem_alloc(unsigned int value, intptr_t semid, sem_t *semp) { sem_t sem; @@ -130,7 +130,7 @@ sem_alloc(unsigned int value, semid_t semid, sem_t *semp) int sem_init(sem_t *sem, int pshared, unsigned int value) { - semid_t semid; + intptr_t semid; int error; semid = USEM_USER; @@ -181,7 +181,7 @@ sem_t * sem_open(const char *name, int oflag, ...) { sem_t *sem, s; - semid_t semid; + intptr_t semid; mode_t mode; unsigned int value; int error; diff --git a/lib/librt/sem.c b/lib/librt/sem.c index 1b76953f8ca..48fb68814ac 100644 --- a/lib/librt/sem.c +++ b/lib/librt/sem.c @@ -1,4 +1,4 @@ -/* $NetBSD: sem.c,v 1.4 2008/04/28 20:23:02 martin Exp $ */ +/* $NetBSD: sem.c,v 1.5 2008/11/14 15:49:20 ad Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: sem.c,v 1.4 2008/04/28 20:23:02 martin Exp $"); +__RCSID("$NetBSD: sem.c,v 1.5 2008/11/14 15:49:20 ad Exp $"); /* * If an application is linked against both librt and libpthread, the @@ -76,7 +76,7 @@ __RCSID("$NetBSD: sem.c,v 1.4 2008/04/28 20:23:02 martin Exp $"); #define sem_post _librt_sem_post #define sem_getvalue _librt_sem_getvalue -#define _LIBC /* XXX to get semid_t type */ +#define _LIBC #include <sys/types.h> #include <sys/ksem.h> @@ -92,11 +92,11 @@ struct _sem_st { #define KSEM_MAGIC 0x90af0421U LIST_ENTRY(_sem_st) ksem_list; - semid_t ksem_semid; /* 0 -> user (non-shared) */ + intptr_t ksem_semid; /* 0 -> user (non-shared) */ sem_t *ksem_identity; }; -static int sem_alloc(unsigned int value, semid_t semid, sem_t *semp); +static int sem_alloc(unsigned int value, intptr_t semid, sem_t *semp); static void sem_free(sem_t sem); static LIST_HEAD(, _sem_st) named_sems = LIST_HEAD_INITIALIZER(&named_sems); @@ -122,7 +122,7 @@ sem_free(sem_t sem) } static int -sem_alloc(unsigned int value, semid_t semid, sem_t *semp) +sem_alloc(unsigned int value, intptr_t semid, sem_t *semp) { sem_t sem; @@ -143,7 +143,7 @@ sem_alloc(unsigned int value, semid_t semid, sem_t *semp) int sem_init(sem_t *sem, int pshared, unsigned int value) { - semid_t semid; + intptr_t semid; int error; if (_ksem_init(value, &semid) == -1) @@ -181,7 +181,7 @@ sem_t * sem_open(const char *name, int oflag, ...) { sem_t *sem, s; - semid_t semid; + intptr_t semid; mode_t mode; unsigned int value; int error; |
