From 0f834b91a4768673833ab4917e87d86c237bb1a6 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 23 Mar 2012 10:05:55 +0100 Subject: libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update 23 Mar 2012 --- xorg-server/hw/xfree86/parser/xf86Optrec.h | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'xorg-server/hw/xfree86/parser/xf86Optrec.h') diff --git a/xorg-server/hw/xfree86/parser/xf86Optrec.h b/xorg-server/hw/xfree86/parser/xf86Optrec.h index b8e9d6192..ea0cb1329 100644 --- a/xorg-server/hw/xfree86/parser/xf86Optrec.h +++ b/xorg-server/hw/xfree86/parser/xf86Optrec.h @@ -52,7 +52,6 @@ * authorization from the copyright holder(s) and author(s). */ - /* * This file contains the Option Record that is passed between the Parser, * and Module setup procs. @@ -69,21 +68,26 @@ #include -extern _X_EXPORT XF86OptionPtr xf86addNewOption(XF86OptionPtr head, char *name, char *val); +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); extern _X_EXPORT char *xf86optionName(XF86OptionPtr opt); extern _X_EXPORT char *xf86optionValue(XF86OptionPtr opt); extern _X_EXPORT XF86OptionPtr xf86newOption(char *name, char *value); extern _X_EXPORT XF86OptionPtr xf86nextOption(XF86OptionPtr list); -extern _X_EXPORT XF86OptionPtr xf86findOption(XF86OptionPtr list, const char *name); -extern _X_EXPORT const char *xf86findOptionValue(XF86OptionPtr list, const char *name); -extern _X_EXPORT XF86OptionPtr xf86optionListCreate(const char **options, int count, int used); -extern _X_EXPORT XF86OptionPtr xf86optionListMerge(XF86OptionPtr head, XF86OptionPtr tail); -extern _X_EXPORT int xf86nameCompare (const char *s1, const char *s2); +extern _X_EXPORT XF86OptionPtr xf86findOption(XF86OptionPtr list, + const char *name); +extern _X_EXPORT const char *xf86findOptionValue(XF86OptionPtr list, + const char *name); +extern _X_EXPORT XF86OptionPtr xf86optionListCreate(const char **options, + int count, int used); +extern _X_EXPORT XF86OptionPtr xf86optionListMerge(XF86OptionPtr head, + XF86OptionPtr tail); +extern _X_EXPORT int xf86nameCompare(const char *s1, const char *s2); extern _X_EXPORT char *xf86uLongToString(unsigned long i); extern _X_EXPORT XF86OptionPtr xf86parseOption(XF86OptionPtr head); -extern _X_EXPORT void xf86printOptionList(FILE *fp, XF86OptionPtr list, int tabs); - +extern _X_EXPORT void xf86printOptionList(FILE * fp, XF86OptionPtr list, + int tabs); -#endif /* _xf86Optrec_h_ */ +#endif /* _xf86Optrec_h_ */ -- cgit v1.2.3