svn merge file:///D:/svnrepos/vcxsrv/branches/released .

1 files changed, 7 insertions, 7 deletions

diff --git a/libX11/src/UIThrStubs.c b/libX11/src/UIThrStubs.c
index 13df9e7ce..487bb06f1 100644
--- a/libX11/src/UIThrStubs.c
+++ b/libX11/src/UIThrStubs.c
@@ -10,10 +10,10 @@
  * distribute, sublicense, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -21,16 +21,16 @@
  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
- * 
+ *
  * Except as contained in this notice, the name of David E. Wexelblat shall
  * not be used in advertising or otherwise to promote the sale, use or
  * other dealings in this Software without prior written authorization
  * from David E. Wexelblat.
- * 
+ *
  */
 
 /*
- * Stubs for thread functions needed by the X library.  Supports 
+ * Stubs for thread functions needed by the X library.  Supports
  * UnixWare 2.x threads; may support Solaris 2 threads as well, but not
  * tested.  Defining things this way removes the dependency of the X
  * library on the threads library, but still supports threads if the user
@@ -145,7 +145,7 @@ _Xthr_equal_stub_()
 #endif /* SVR4 */
 #endif /* CTHREADS */
 
-static xthread_t 
+static xthread_t
 _Xthr_self_stub_()
 {
     static xthread_t _X_no_thread_id;
@@ -153,7 +153,7 @@ _Xthr_self_stub_()
     return(_X_no_thread_id);	/* defined by <X11/Xthreads.h> */
 }
 
-static int 
+static int
 _Xthr_zero_stub_()
 {
     return(0);