diff options
| author | Marc G. Fournier <scrappy@hub.org> | 1997-02-06 05:30:50 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@hub.org> | 1997-02-06 05:30:50 +0000 |
| commit | e72b1ccd30ca89c250a021def7ab82c2f417dbfe (patch) | |
| tree | ce51b39f171d60af0e11f48e3afab2cbbea4ad2a /src/include | |
| parent | 321d42c6d049fc72d387d75bcd78405ea5df16ff (diff) | |
Add test for union semun to configure
Remove references to NEED_UNION_SEMUN from include/config.h.in and
from include/storage/ipc.h, replacing it with a single HAVE_UNION_SEMUN
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/config.h.in | 19 | ||||
| -rw-r--r-- | src/include/storage/ipc.h | 4 |
2 files changed, 5 insertions, 18 deletions
diff --git a/src/include/config.h.in b/src/include/config.h.in index 833222709c3..e5157ce7b90 100644 --- a/src/include/config.h.in +++ b/src/include/config.h.in @@ -71,6 +71,9 @@ /* Set to 1 if you have libhistory.a */ #undef HAVE_LIBHISTORY +/* Set to 1 if you have union semun */ +#undef HAVE_UNION_SEMUN + /* * Code below this point should not require changes */ @@ -78,7 +81,6 @@ #if defined(aix) # define CLASS_CONFLICT # define DISABLE_XOPEN_NLS -# define NEED_UNION_SEMUN # define HAVE_SYS_SELECT_H # define HAVE_ANSI_CPP # define HAS_TEST_AND_SET @@ -90,7 +92,6 @@ # define USE_POSIX_SIGNALS # define DISABLE_XOPEN_NLS # define HAS_LONG_LONG -# define NEED_UNION_SEMUN # define HAS_TEST_AND_SET # include <sys/mman.h> /* for msemaphore */ typedef msemaphore slock_t; @@ -113,9 +114,6 @@ # if defined(sparc) # define NEED_SPARC_TAS_ASM # endif -# if defined(PRE_BSDI_2_1) -# define NEED_UNION_SEMUN -# endif # define USE_POSIX_TIME # define HAS_TEST_AND_SET typedef unsigned char slock_t; @@ -124,14 +122,12 @@ #if defined(dgux) # define LINUX_ELF -# define NEED_UNION_SEMUN # define USE_POSIX_SIGNALS #endif #if defined(hpux) # define JMP_BUF # define USE_POSIX_TIME -# define NEED_UNION_SEMUN # define HAS_TEST_AND_SET typedef struct { int sem[4]; } slock_t; #endif @@ -141,7 +137,6 @@ # define USE_POSIX_SIGNALS # define NEED_RUSAGE # define NO_EMPTY_STMTS -# define NEED_UNION_SEMUN # define SYSV_DIRENT # define HAS_TEST_AND_SET typedef unsigned char slock_t; @@ -195,17 +190,12 @@ typedef struct mutex slock_t; #endif -#if defined(sequent) -# define NEED_UNION_SEMUN -#endif - #if defined(sparc_solaris) # define USE_POSIX_TIME # define USE_POSIX_SIGNALS # define NEED_RUSAGE # define NO_EMPTY_STMTS # define USE_POSIX_TIME -# define NEED_UNION_SEMUN # define SYSV_DIRENT # define HAS_TEST_AND_SET typedef unsigned char slock_t; @@ -221,7 +211,6 @@ typedef unsigned char slock_t; # define USE_POSIX_SIGNALS # define NEED_RUSAGE # define NO_EMPTY_STMTS -# define NEED_UNION_SEMUN # define SYSV_DIRENT #endif @@ -231,7 +220,6 @@ typedef unsigned char slock_t; # define NO_UNISTD_H # define USES_WINSOCK # define NOFILE 100 -# define NEED_UNION_SEMUN # ifndef MAXPATHLEN # define MAXPATHLEN 250 # endif @@ -239,7 +227,6 @@ typedef unsigned char slock_t; #if defined(ultrix4) # define USE_POSIX_TIME -# define NEED_UNION_SEMUN # define NEED_STRDUP #endif diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h index 87ba9898c10..1fb86c7d610 100644 --- a/src/include/storage/ipc.h +++ b/src/include/storage/ipc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: ipc.h,v 1.13 1997/01/26 20:15:26 momjian Exp $ + * $Id: ipc.h,v 1.14 1997/02/06 05:30:50 scrappy Exp $ * * NOTES * This file is very architecture-specific. This stuff should actually @@ -43,7 +43,7 @@ extern int S_LOCK_FREE(slock_t *lock); #endif /* HAS_TEST_AND_SET */ -#ifdef NEED_UNION_SEMUN +#ifndef HAVE_UNION_SEMUN union semun { int val; struct semid_ds *buf; |