From 907e82ec46673efe0cac76a4706285d2e49090e1 Mon Sep 17 00:00:00 2001
From: ericm <ericm>
Date: Thu, 20 Jul 2000 21:38:28 +0000
Subject: * unix/tkUnixDraw.c (TkScrollWindow): Replaced a use of a trinary
 operator with an if/else, to avoid build problems on some platforms [Bug:
 5819].

---
 ChangeLog         | 4 ++++
 unix/tkUnixDraw.c | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 687b06e..8df5cc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2000-07-20  Eric Melski  <ericm@ajubasolutions.com>
 
+	* unix/tkUnixDraw.c (TkScrollWindow): Replaced a use of a trinary
+	operator with an if/else, to avoid build problems on some
+	platforms [Bug: 5819].
+
 	* win/makefile.vc: Applied patch from Don Porter to enhance nmake
 	support on NT/Alpha [RFE: 5939].
 
diff --git a/unix/tkUnixDraw.c b/unix/tkUnixDraw.c
index cc9f736..82576bf 100644
--- a/unix/tkUnixDraw.c
+++ b/unix/tkUnixDraw.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkUnixDraw.c,v 1.5 1999/09/02 17:03:23 hobbs Exp $
+ * RCS: @(#) $Id: tkUnixDraw.c,v 1.6 2000/07/20 21:38:28 ericm Exp $
  */
 
 #include "tkPort.h"
@@ -94,7 +94,11 @@ TkScrollWindow(tkwin, gc, x, y, width, height, dx, dy, damageRgn)
     }
     Tk_RestrictEvents(oldProc, oldArg, &dummy);
 
-    return XEmptyRegion((Region) damageRgn) ? 0 : 1;
+    if (XEmptyRegion((Region) damageRgn)) {
+	return 0;
+    } else {
+	return 1;
+    }
 }
 
 /*
-- 
cgit v0.12