Signed-off-by: Eric Engestrom <[email protected]>
---
hw/xwin/InitOutput.c | 2 +-
hw/xwin/ddraw.h | 2 +-
hw/xwin/glx/indirect.c | 2 +-
hw/xwin/man/XWin.man | 2 +-
hw/xwin/win.h | 2 +-
hw/xwin/wincreatewnd.c | 2 +-
hw/xwin/winscrinit.c | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index 1190124..0d56bb4 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -140,7 +140,7 @@ void XwinExtensionInit(void)
#if defined(DDXBEFORERESET)
/*
* Called right before KillAllClients when the server is going to reset,
- * allows us to shutdown our seperate threads cleanly.
+ * allows us to shutdown our separate threads cleanly.
*/
void
diff --git a/hw/xwin/ddraw.h b/hw/xwin/ddraw.h
index 4c9af77..99d1ec9 100644
--- a/hw/xwin/ddraw.h
+++ b/hw/xwin/ddraw.h
@@ -827,7 +827,7 @@ extern "C" {
/* DDCAPS.dwSVCaps */
/* the first 4 of these are now obsolete */
-#if DIRECTDRAW_VERSION >= 0x700 /* FIXME: I'm not sure when this switch
occured */
+#if DIRECTDRAW_VERSION >= 0x700 /* FIXME: I'm not sure when this switch
occurred */
#define DDSVCAPS_RESERVED1 0x00000001
#define DDSVCAPS_RESERVED2 0x00000002
#define DDSVCAPS_RESERVED3 0x00000004
diff --git a/hw/xwin/glx/indirect.c b/hw/xwin/glx/indirect.c
index 26832e6..77be1d6 100644
--- a/hw/xwin/glx/indirect.c
+++ b/hw/xwin/glx/indirect.c
@@ -772,7 +772,7 @@ glxWinCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg,
RegionPtr prgnSrc)
Discard any CopyWindow requests if a GL drawing context is pointing at
the window
For regions which are being drawn by GL, the shadow framebuffer doesn't
have the
- correct bits, so we wish to avoid shadow framebuffer damage occuring,
which will
+ correct bits, so we wish to avoid shadow framebuffer damage occurring,
which will
cause those incorrect bits to be transferred to the display....
*/
if (pGlxDraw && pGlxDraw->drawContext) {
diff --git a/hw/xwin/man/XWin.man b/hw/xwin/man/XWin.man
index 7ffdd6c..44afc54 100644
--- a/hw/xwin/man/XWin.man
+++ b/hw/xwin/man/XWin.man
@@ -71,7 +71,7 @@ Screen specific parameters can be applied as a
default to all screens by placing those screen specific parameters
before any \fB\-screen\fP parameter. Screen specific parameters placed after
the first \fB\-screen\fP parameter will apply only to the immediately
-preceeding \fB\-screen\fP parameter.
+preceding \fB\-screen\fP parameter.
.TP 8
.B \-[no]multimonitors or \-[no]multiplemonitors
Create a screen 0 that covers all monitors [the primary monitor] on a system
with
diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index f9c44b3..897322f 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -486,7 +486,7 @@ typedef struct _winPrivScreenRec {
#endif
#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
- /* Privates used for any module running in a seperate thread */
+ /* Privates used for any module running in a separate thread */
pthread_mutex_t pmServerStarted;
Bool fServerStarted;
#endif
diff --git a/hw/xwin/wincreatewnd.c b/hw/xwin/wincreatewnd.c
index b2f797c..36ce915 100644
--- a/hw/xwin/wincreatewnd.c
+++ b/hw/xwin/wincreatewnd.c
@@ -231,7 +231,7 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen)
/* Did the user specify a height and width? */
if (pScreenInfo->fUserGaveHeightAndWidth) {
- /* User gave a desired height and width, try to accomodate */
+ /* User gave a desired height and width, try to accommodate */
#if CYGDEBUG
winDebug("winCreateBoundingWindowWindowed - User gave height "
"and width\n");
diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c
index 6cbf08d..ae1d1df 100644
--- a/hw/xwin/winscrinit.c
+++ b/hw/xwin/winscrinit.c
@@ -321,7 +321,7 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc,
char **argv)
* own colormap, as it cannot allocate 7 planes in the default
* colormap. Setting whitePixel to 1 allows Magic to get 7
* planes in the default colormap, so it doesn't create its
- * own colormap. This latter situation is highly desireable,
+ * own colormap. This latter situation is highly desirable,
* as it keeps the Magic window viewable when switching to
* other X clients that use the default colormap.
*/
--
2.8.0
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel
