summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/GL/glxproto.h4
-rw-r--r--include/X11/XF86keysym.h6
-rw-r--r--include/X11/dri/xf86driproto.h2
-rw-r--r--include/X11/extensions/Print.h4
-rw-r--r--include/X11/extensions/XI2proto.h2
-rw-r--r--include/X11/extensions/XKB.h2
-rw-r--r--include/X11/extensions/syncstr.h2
-rw-r--r--include/X11/extensions/xf86misc.h2
-rw-r--r--include/X11/extensions/xtrapdi.h6
-rw-r--r--include/X11/fonts/fontstruct.h2
10 files changed, 16 insertions, 16 deletions
diff --git a/include/GL/glxproto.h b/include/GL/glxproto.h
index 736fb58..e4dfc10 100644
--- a/include/GL/glxproto.h
+++ b/include/GL/glxproto.h
@@ -36,7 +36,7 @@
/*****************************************************************************/
/*
-** Errrors.
+** Errors.
*/
#define GLXBadContext 0
#define GLXBadContextState 1
@@ -1296,7 +1296,7 @@ typedef struct {
/**
* Protocol header for glXSetClientInfoARB
*
- * This structure is follwed by \c numVersions * 2 \c CARD32 values listing
+ * This structure is followed by \c numVersions * 2 \c CARD32 values listing
* the OpenGL versions supported by the client. The pairs of values are an
* OpenGL major version followed by a minor version. For example,
*
diff --git a/include/X11/XF86keysym.h b/include/X11/XF86keysym.h
index c0d12c1..771fbb0 100644
--- a/include/X11/XF86keysym.h
+++ b/include/X11/XF86keysym.h
@@ -117,12 +117,12 @@
#define XF86XK_Explorer 0x1008FF5D /* Launch file explorer */
#define XF86XK_Game 0x1008FF5E /* Launch game */
#define XF86XK_Go 0x1008FF5F /* Go to URL */
-#define XF86XK_iTouch 0x1008FF60 /* Logitch iTouch- don't use */
+#define XF86XK_iTouch 0x1008FF60 /* Logitech iTouch- don't use */
#define XF86XK_LogOff 0x1008FF61 /* Log off system */
#define XF86XK_Market 0x1008FF62 /* ?? */
#define XF86XK_Meeting 0x1008FF63 /* enter meeting in calendar */
-#define XF86XK_MenuKB 0x1008FF65 /* distingush keyboard from PB */
-#define XF86XK_MenuPB 0x1008FF66 /* distinuish PB from keyboard */
+#define XF86XK_MenuKB 0x1008FF65 /* distinguish keyboard from PB */
+#define XF86XK_MenuPB 0x1008FF66 /* distinguish PB from keyboard */
#define XF86XK_MySites 0x1008FF67 /* Favourites */
#define XF86XK_New 0x1008FF68 /* New (folder, document... */
#define XF86XK_News 0x1008FF69 /* News */
diff --git a/include/X11/dri/xf86driproto.h b/include/X11/dri/xf86driproto.h
index 509b115..1202e9b 100644
--- a/include/X11/dri/xf86driproto.h
+++ b/include/X11/dri/xf86driproto.h
@@ -42,7 +42,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define XF86DRINAME "XFree86-DRI"
/* The DRI version number. This was originally set to be the same of the
- * XFree86 version number. However, this version is really indepedent of
+ * XFree86 version number. However, this version is really independent of
* the XFree86 version.
*
* Version History:
diff --git a/include/X11/extensions/Print.h b/include/X11/extensions/Print.h
index 266069a..5516cff 100644
--- a/include/X11/extensions/Print.h
+++ b/include/X11/extensions/Print.h
@@ -15,7 +15,7 @@
** o Extension version structure
**
** Library and client subportion has:
- ** o Convience Marcos
+ ** o Convenience Macros
** o Client side data structures
** o Client side event structures (non wire)
** o Library function prototypes
@@ -269,7 +269,7 @@ typedef char * (*XPHinterProc)(void);
*
* Extension version structures.
*
- **** this structure is now defined localy in the one file that uses it
+ **** this structure is now defined locally in the one file that uses it
**** in order to avoid clashes with its definition in XI.h
*/
typedef struct {
diff --git a/include/X11/extensions/XI2proto.h b/include/X11/extensions/XI2proto.h
index 28a9062..a1133b5 100644
--- a/include/X11/extensions/XI2proto.h
+++ b/include/X11/extensions/XI2proto.h
@@ -44,7 +44,7 @@
* appended to the common structs section before the definition of the
* first request.
* members of structs vertically aligned on column 16 if datatypes permit.
- * otherwise alingned on next available 8n column.
+ * otherwise aligned on next available 8n column.
*/
/**
diff --git a/include/X11/extensions/XKB.h b/include/X11/extensions/XKB.h
index b46be8a..7e702eb 100644
--- a/include/X11/extensions/XKB.h
+++ b/include/X11/extensions/XKB.h
@@ -684,7 +684,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define XkbIM_UseAnyMods (XkbIM_UseAnyGroup|XkbIM_UseCompat)
/*
- * Compatibility Map Compontents:
+ * Compatibility Map Components:
* - Specifies the components to be allocated in XkbAllocCompatMap.
*/
#define XkbSymInterpMask (1<<0)
diff --git a/include/X11/extensions/syncstr.h b/include/X11/extensions/syncstr.h
index 95bc2ac..4e8db1b 100644
--- a/include/X11/extensions/syncstr.h
+++ b/include/X11/extensions/syncstr.h
@@ -155,7 +155,7 @@ typedef union {
extern pointer SyncCreateSystemCounter(
char * /* name */,
- CARD64 /* inital_value */,
+ CARD64 /* initial_value */,
CARD64 /* resolution */,
SyncCounterType /* change characterization */,
void (* /*QueryValue*/ ) (
diff --git a/include/X11/extensions/xf86misc.h b/include/X11/extensions/xf86misc.h
index f5d7a56..611871d 100644
--- a/include/X11/extensions/xf86misc.h
+++ b/include/X11/extensions/xf86misc.h
@@ -81,7 +81,7 @@
#define MiscExtGrabStateLocked 1 /* A client already requested that
* grabs cannot be removed/killed */
#define MiscExtGrabStateAlready 2 /* Request for enabling/disabling
- * grab removeal/kill already done */
+ * grab removal/kill already done */
_XFUNCPROTOBEGIN
diff --git a/include/X11/extensions/xtrapdi.h b/include/X11/extensions/xtrapdi.h
index 26449bb..e26cb9c 100644
--- a/include/X11/extensions/xtrapdi.h
+++ b/include/X11/extensions/xtrapdi.h
@@ -112,7 +112,7 @@ typedef struct
{
CARD8 valid[4L]; /* Bits TRUE indicates data field is used */
CARD8 data[4L]; /* Bits looked at if corresponding valid bit set */
- ReqFlags req; /* Bits coorespond to core requests */
+ ReqFlags req; /* Bits correspond to core requests */
EventFlags event; /* Bits correspond to core events */
} XETrapFlags;
@@ -207,7 +207,7 @@ typedef struct
CARD8 minor_opcode;
CARD16 length;
/*
- * The follwing is done so that structure padding wont be
+ * The following is done so that structure padding wont be
* a problem. The request structure contains a shadow for
* the XETrapCfg structure. Since the XETrapCfg also has a
* substructure (XETrapFlags) this structure is also shadowed.
@@ -294,7 +294,7 @@ typedef struct
/* Structure of Get Current Configuration Information reply */
typedef struct
{
- CARD8 state_flags[2]; /* Miscelaneous flags, see below #define's */
+ CARD8 state_flags[2]; /* Miscellaneous flags, see below #define's */
CARD16 pad0; /* Assure quadword alignment */
XETrapCfg config; /* Current Config information */
CARD32 pad1;
diff --git a/include/X11/fonts/fontstruct.h b/include/X11/fonts/fontstruct.h
index 55c89da..a327ef9 100644
--- a/include/X11/fonts/fontstruct.h
+++ b/include/X11/fonts/fontstruct.h
@@ -30,7 +30,7 @@ SOFTWARE.
#include <X11/Xdefs.h>
/*
- * This version of the server font data strucutre is only for describing
+ * This version of the server font data structure is only for describing
* the in memory data structure. The file structure is not necessarily a
* copy of this. That is up to the compiler and the OS layer font loading
* machinery.