From 5730c765c34b25546235bb7045c4e9552c9eb9e2 Mon Sep 17 00:00:00 2001
From: dan <dan>
Date: Thu, 30 Mar 2000 04:52:43 +0000
Subject: [PATCH] Fix for non-gcc compilers

---
 WINGs/connection.c |  4 ++--
 WINGs/data.c       | 19 ++++++++++++++-----
 wrlib/gradient.c   |  3 +--
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/WINGs/connection.c b/WINGs/connection.c
index ff82fb17..1fdf3b38 100644
--- a/WINGs/connection.c
+++ b/WINGs/connection.c
@@ -710,7 +710,7 @@ WMSendConnectionData(WMConnection *cPtr, WMData *data) /*FOLD00*/
 {
     int bytes, pos, len, totalTransfer;
     TimeoutData *tPtr = &cPtr->sendTimeout;
-    const void *dataBytes;
+    const unsigned char *dataBytes;
 
     wassertrv(cPtr->state!=WCNotConnected && cPtr->state!=WCListening, -1);
     wassertrv(cPtr->state!=WCInProgress && cPtr->state!=WCFailed, -1);
@@ -733,7 +733,7 @@ WMSendConnectionData(WMConnection *cPtr, WMData *data) /*FOLD00*/
 
     while (WMGetBagItemCount(cPtr->outputQueue) > 0) {
         data = WMGetFromBag(cPtr->outputQueue, 0);
-        dataBytes = WMDataBytes(data);
+        dataBytes = (const unsigned char *)WMDataBytes(data);
         len = WMGetDataLength(data);
         pos = cPtr->bufPos; /* where we're left last time */
         while(pos < len) {
diff --git a/WINGs/data.c b/WINGs/data.c
index eb5beb0a..38bf11f2 100644
--- a/WINGs/data.c
+++ b/WINGs/data.c
@@ -158,7 +158,9 @@ WMSetDataLength(WMData *aData, unsigned length) /*FOLD00*/
         WMSetDataCapacity(aData, length);
     }
     if (length > aData->length) {
-        memset(aData->bytes + aData->length, 0, length - aData->length);
+		unsigned char	*dataBytes = (unsigned char *)aData->bytes;
+
+        memset(dataBytes + aData->length, 0, length - aData->length);
     }
     aData->length = length;
 }
@@ -202,10 +204,12 @@ WMGetDataBytesWithLength(WMData *aData, void *buffer, unsigned length) /*FOLD00*
 void
 WMGetDataBytesWithRange(WMData *aData, void *buffer, WMRange aRange) /*FOLD00*/
 {
+	unsigned char *dataBytes = (unsigned char *)aData->bytes;
+
     wassertr(aRange.position < aData->length);
     wassertr(aRange.count <= aData->length-aRange.position);
 
-    memcpy(buffer, aData->bytes + aRange.position, aRange.count);
+    memcpy(buffer,dataBytes + aRange.position, aRange.count);
 }
 
 
@@ -258,6 +262,7 @@ WMAppendDataBytes(WMData *aData, void *bytes, unsigned length) /*FOLD00*/
 {
     unsigned oldLength = aData->length;
     unsigned newLength = oldLength + length;
+	unsigned char *dataBytes = (unsigned char *)aData->bytes;
 
     if (newLength > aData->capacity) {
         unsigned nextCapacity = aData->capacity + aData->growth;
@@ -272,7 +277,7 @@ WMAppendDataBytes(WMData *aData, void *bytes, unsigned length) /*FOLD00*/
         WMSetDataCapacity(aData, nextCapacity);
         aData->growth = nextGrowth;
     }
-    memcpy(aData->bytes + oldLength, bytes, length);
+    memcpy(dataBytes + oldLength, bytes, length);
     aData->length = newLength;
 }
 
@@ -291,20 +296,24 @@ WMAppendData(WMData *aData, WMData *anotherData) /*FOLD00*/
 void
 WMReplaceDataBytesInRange(WMData *aData, WMRange aRange, void *bytes) /*FOLD00*/
 {
+	unsigned char *dataBytes = (unsigned char *)aData->bytes;
+
     wassertr(aRange.position < aData->length);
     wassertr(aRange.count <= aData->length-aRange.position);
 
-    memcpy(aData->bytes + aRange.position, bytes, aRange.count);
+    memcpy(dataBytes + aRange.position, bytes, aRange.count);
 }
 
 
 void
 WMResetDataBytesInRange(WMData *aData, WMRange aRange) /*FOLD00*/
 {
+	unsigned char *dataBytes = (unsigned char *)aData->bytes;
+
     wassertr(aRange.position < aData->length);
     wassertr(aRange.count <= aData->length-aRange.position);
 
-    memset(aData->bytes + aRange.position, 0, aRange.count);
+    memset(dataBytes + aRange.position, 0, aRange.count);
 }
 
 
diff --git a/wrlib/gradient.c b/wrlib/gradient.c
index b4612eb4..dd7c2cd4 100644
--- a/wrlib/gradient.c
+++ b/wrlib/gradient.c
@@ -172,14 +172,13 @@ renderVGradient(unsigned width, unsigned height, int r0, int g0, int b0,
     unsigned long r, g, b, dr, dg, db;
     RImage *image;
     unsigned char *ptr;
-    unsigned int *iptr;
     unsigned char rr, gg, bb;
 
     image = RCreateImage(width, height, False);
     if (!image) {
 	return NULL;
     }    
-    iptr = (unsigned int*)ptr = image->data;
+    ptr = image->data;
 
     r = r0<<16;
     g = g0<<16;
-- 
2.11.4.GIT