summaryrefslogtreecommitdiff
path: root/xc/programs/Xserver/hw/xfree86/parser/xf86Parser.h
diff options
context:
space:
mode:
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/parser/xf86Parser.h')
-rw-r--r--xc/programs/Xserver/hw/xfree86/parser/xf86Parser.h14
1 files changed, 12 insertions, 2 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/parser/xf86Parser.h b/xc/programs/Xserver/hw/xfree86/parser/xf86Parser.h
index 27b476901..5a780e6cb 100644
--- a/xc/programs/Xserver/hw/xfree86/parser/xf86Parser.h
+++ b/xc/programs/Xserver/hw/xfree86/parser/xf86Parser.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/xf86Parser.h,v 1.23 2000/10/24 22:45:10 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/xf86Parser.h,v 1.25 2000/11/02 19:58:21 anderson Exp $ */
/*
*
* Copyright (c) 1997 Metro Link Incorporated
@@ -338,11 +338,21 @@ typedef struct
}
XF86ConfLayoutRec, *XF86ConfLayoutPtr;
+typedef struct
+{
+ GenericListRec list;
+ char *vs_name;
+ char *vs_identifier;
+ XF86OptionPtr vs_option_lst;
+}
+XF86ConfVendSubRec, *XF86ConfVendSubPtr;
+
typedef struct
{
GenericListRec list;
char *vnd_identifier;
XF86OptionPtr vnd_option_lst;
+ XF86ConfVendSubPtr vnd_sub_lst;
char *vnd_comment;
}
XF86ConfVendorRec, *XF86ConfVendorPtr;
@@ -396,7 +406,7 @@ extern const char *xf86openConfigFile (const char *, const char *,
const char *);
extern XF86ConfigPtr xf86readConfigFile (void);
extern void xf86closeConfigFile (void);
-extern void XF86freeConfig (XF86ConfigPtr p);
+extern void xf86freeConfig (XF86ConfigPtr p);
extern int xf86writeConfigFile (const char *, XF86ConfigPtr);
XF86ConfDevicePtr xf86findDevice(const char *ident, XF86ConfDevicePtr p);
XF86ConfLayoutPtr xf86findLayout(const char *name, XF86ConfLayoutPtr list);