diff options
Diffstat (limited to 'hw/xfree86/common/xf86Config.h')
| -rw-r--r-- | hw/xfree86/common/xf86Config.h | 38 |
1 files changed, 35 insertions, 3 deletions
diff --git a/hw/xfree86/common/xf86Config.h b/hw/xfree86/common/xf86Config.h index 6a24df0e0..e54da3d09 100644 --- a/hw/xfree86/common/xf86Config.h +++ b/hw/xfree86/common/xf86Config.h @@ -1,6 +1,30 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.h,v 1.5 2000/02/24 05:36:50 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.h,v 1.7 2003/10/08 14:58:27 dawes Exp $ */ + /* - * Copyright 1997 by The XFree86 Project, Inc + * Copyright (c) 1997-2000 by The XFree86 Project, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the name of the copyright holder(s) + * and author(s) shall not be used in advertising or otherwise to promote + * the sale, use or other dealings in this Software without prior written + * authorization from the copyright holder(s) and author(s). */ #ifndef _xf86_config_h @@ -13,6 +37,12 @@ extern XF86ConfigPtr xf86configptr; #endif +typedef enum _ConfigStatus { + CONFIG_OK = 0, + CONFIG_PARSE_ERROR, + CONFIG_NOFILE +} ConfigStatus; + /* * prototypes */ @@ -22,6 +52,8 @@ char ** xf86DriverlistFromCompile(void); char ** xf86InputDriverlistFromConfig(void); char ** xf86InputDriverlistFromCompile(void); Bool xf86BuiltinInputDriver(const char *); -Bool xf86HandleConfigFile(void); +ConfigStatus xf86HandleConfigFile(Bool); + +Bool xf86AutoConfig(void); #endif /* _xf86_config_h */ |