diff options
author | Ulrich Sibiller <uli42@gmx.de> | 2016-08-02 01:23:54 +0200 |
---|---|---|
committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-10 22:52:30 +0200 |
commit | 35270a3d9b307d80bd737db5f98ac8a7151c23d4 (patch) | |
tree | 0d0cf8d8540a39a08097efb6d7c527d3d663bc64 /nx-X11/lib/X11/Xresource.h | |
parent | 7b0bdde5c5ce290d52d6e6aba1cd73fe3130093a (diff) | |
download | nx-libs-35270a3d9b307d80bd737db5f98ac8a7151c23d4.tar.gz nx-libs-35270a3d9b307d80bd737db5f98ac8a7151c23d4.tar.bz2 nx-libs-35270a3d9b307d80bd737db5f98ac8a7151c23d4.zip |
adapt include files to libX11 1.3.4
Diffstat (limited to 'nx-X11/lib/X11/Xresource.h')
-rw-r--r-- | nx-X11/lib/X11/Xresource.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nx-X11/lib/X11/Xresource.h b/nx-X11/lib/X11/Xresource.h index 4a2e8d044..f3977a209 100644 --- a/nx-X11/lib/X11/Xresource.h +++ b/nx-X11/lib/X11/Xresource.h @@ -28,13 +28,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -177,7 +177,7 @@ typedef struct _XrmHashBucketRec *XrmDatabase; extern void XrmDestroyDatabase( - XrmDatabase /* database */ + XrmDatabase /* database */ ); extern void XrmQPutResource( @@ -332,7 +332,7 @@ typedef enum { XrmoptionResArg, /* Resource and value in next argument in argv */ XrmoptionSkipArg, /* Ignore this option and the next argument in argv */ XrmoptionSkipLine, /* Ignore this option and the rest of argv */ - XrmoptionSkipNArgs /* Ignore this option and the next + XrmoptionSkipNArgs /* Ignore this option and the next OptionDescRes.value arguments in argv */ } XrmOptionKind; @@ -350,7 +350,7 @@ extern void XrmParseCommand( int /* table_count */, _Xconst char* /* name */, int* /* argc_in_out */, - char** /* argv_in_out */ + char** /* argv_in_out */ ); _XFUNCPROTOEND |