diff options
| author | Nathan Scott <nathans@sgi.com> | 2003-03-18 20:02:48 +0000 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2003-03-18 20:02:48 +0000 |
| commit | dc8a883a1b4876e4f15ef063bb688d254446a44c (patch) | |
| tree | d5f73a1f0bf9bd1e7000bbb2723983ac14102809 | |
| parent | 6dbd08c44cbecac12ea98f78188a4b933211182b (diff) | |
| download | dmapi-dev-dc8a883a1b4876e4f15ef063bb688d254446a44c.tar.gz | |
Sync up userspace dmapi.h with kernel.
| -rw-r--r-- | include/dmapi.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/include/dmapi.h b/include/dmapi.h index dd8840b..e88eadb 100644 --- a/include/dmapi.h +++ b/include/dmapi.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995-2002 Silicon Graphics, Inc. All Rights Reserved. + * Copyright (c) 1995-2003 Silicon Graphics, Inc. All Rights Reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2.1 of the GNU Lesser General Public License @@ -31,8 +31,8 @@ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ -#ifndef _SYS_DMAPI_H -#define _SYS_DMAPI_H +#ifndef __DMAPI_H__ +#define __DMAPI_H__ #ifdef __cplusplus extern "C" { @@ -248,6 +248,8 @@ struct dm_dispinfo { typedef struct dm_dispinfo dm_dispinfo_t; +#ifndef HAVE_DM_EVENTTYPE_T +#define HAVE_DM_EVENTTYPE_T typedef enum { DM_EVENT_INVALID = -1, DM_EVENT_CANCEL = 0, /* not supported */ @@ -275,6 +277,7 @@ typedef enum { DM_EVENT_USER = 22, DM_EVENT_MAX = 23 } dm_eventtype_t; +#endif struct dm_eventmsg { @@ -389,11 +392,14 @@ typedef enum { } dm_response_t; +#ifndef HAVE_DM_RIGHT_T +#define HAVE_DM_RIGHT_T typedef enum { DM_RIGHT_NULL, DM_RIGHT_SHARED, DM_RIGHT_EXCL } dm_right_t; +#endif struct dm_stat { @@ -1039,5 +1045,4 @@ dm_get_dioinfo( } #endif -#endif /* _SYS_DMAPI_H */ - +#endif /* __DMAPI_H__ */ |