Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1

1 files changed, 29 insertions, 29 deletions

diff --git a/src/glut/os2/glut_warp.cpp b/src/glut/os2/glut_warp.cpp
index 885e169d3f..4ef6f7bf39 100644
--- a/src/glut/os2/glut_warp.cpp
+++ b/src/glut/os2/glut_warp.cpp
@@ -1,29 +1,29 @@
-

-/* Copyright (c) Mark J. Kilgard, 1996, 1997. */

-

-/* This program is freely distributable without licensing fees

-   and is provided without guarantee or warrantee expressed or

-   implied. This program is -not- in the public domain. */

-

-#include <stdlib.h>

-#include <stdarg.h>

-#include <stdio.h>

-

-#include "glutint.h"

-

-/* CENTRY */

-void GLUTAPIENTRY

-glutWarpPointer(int x, int y)

-{

-//  XWarpPointer(__glutDisplay, None, __glutCurrentWindow->win,

-//    0, 0, 0, 0, x, y);

-  POINTL point;

-  point.x = x;

-  point.y = y;

-  WinMapWindowPoints(__glutCurrentWindow->win,HWND_DESKTOP,&point,1);

-  WinSetPointerPos(HWND_DESKTOP, point.x, point.y);

-

-  XFlush(__glutDisplay);

-}

-

-/* ENDCENTRY */

+
+/* Copyright (c) Mark J. Kilgard, 1996, 1997. */
+
+/* This program is freely distributable without licensing fees
+   and is provided without guarantee or warrantee expressed or
+   implied. This program is -not- in the public domain. */
+
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "glutint.h"
+
+/* CENTRY */
+void GLUTAPIENTRY
+glutWarpPointer(int x, int y)
+{
+//  XWarpPointer(__glutDisplay, None, __glutCurrentWindow->win,
+//    0, 0, 0, 0, x, y);
+  POINTL point;
+  point.x = x;
+  point.y = y;
+  WinMapWindowPoints(__glutCurrentWindow->win,HWND_DESKTOP,&point,1);
+  WinSetPointerPos(HWND_DESKTOP, point.x, point.y);
+
+  XFlush(__glutDisplay);
+}
+
+/* ENDCENTRY */