diff options
Diffstat (limited to 'xorg-server/hw/xfree86/parser')
| -rw-r--r-- | xorg-server/hw/xfree86/parser/Makefile.am | 2 | ||||
| -rw-r--r-- | xorg-server/hw/xfree86/parser/xf86Optrec.h | 25 |
2 files changed, 3 insertions, 24 deletions
diff --git a/xorg-server/hw/xfree86/parser/Makefile.am b/xorg-server/hw/xfree86/parser/Makefile.am index 1cd70e7a5..002cfbf5c 100644 --- a/xorg-server/hw/xfree86/parser/Makefile.am +++ b/xorg-server/hw/xfree86/parser/Makefile.am @@ -50,3 +50,5 @@ EXTRA_DIST = \ sdk_HEADERS = \ xf86Parser.h \ xf86Optrec.h + +INCLUDES = -I$(srcdir)/../common diff --git a/xorg-server/hw/xfree86/parser/xf86Optrec.h b/xorg-server/hw/xfree86/parser/xf86Optrec.h index 5ccf7285b..61a8c5ff5 100644 --- a/xorg-server/hw/xfree86/parser/xf86Optrec.h +++ b/xorg-server/hw/xfree86/parser/xf86Optrec.h @@ -65,33 +65,10 @@ #define _xf86Optrec_h_ #include <stdio.h> #include <string.h> +#include "xf86Optionstr.h" #include <X11/Xfuncproto.h> -/* - * all records that need to be linked lists should contain a GenericList as - * their first field. - */ -typedef struct generic_list_rec -{ - void *next; -} -GenericListRec, *GenericListPtr, *glp; - -/* - * All options are stored using this data type. - */ -typedef struct -{ - GenericListRec list; - char *opt_name; - char *opt_val; - int opt_used; - char *opt_comment; -} -XF86OptionRec, *XF86OptionPtr; - - extern _X_EXPORT XF86OptionPtr xf86addNewOption(XF86OptionPtr head, char *name, char *val); extern _X_EXPORT XF86OptionPtr xf86optionListDup(XF86OptionPtr opt); extern _X_EXPORT void xf86optionListFree(XF86OptionPtr opt); |