From 8b88489b9060dc4aee180a3f8816c0b8b64a4e51 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Wed, 3 Sep 2008 22:30:18 +0000
Subject: [PATCH] Latest gcc doesn't like variables named 'true'.

---
 src/rsrv/caservertask.c  | 6 +++---
 src/rsrv/online_notify.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/rsrv/caservertask.c b/src/rsrv/caservertask.c
index f632195e5..43204c254 100644
--- a/src/rsrv/caservertask.c
+++ b/src/rsrv/caservertask.c
@@ -837,7 +837,7 @@ struct client *create_tcp_client ( SOCKET sock )
 {
     int                     status;
     struct client           *client;
-    int                     true = TRUE;
+    int                     intTrue = TRUE;
     osiSocklen_t            addrSize;
     unsigned                priorityOfEvents;
 
@@ -852,7 +852,7 @@ struct client *create_tcp_client ( SOCKET sock )
      * faster. I take care of queue up as load increases.
      */
     status = setsockopt ( sock, IPPROTO_TCP, TCP_NODELAY, 
-                (char *) &true, sizeof (true) );
+                (char *) &intTrue, sizeof (intTrue) );
     if (status < 0) {
         errlogPrintf ( "CAS: TCP_NODELAY option set failed\n" );
         destroy_client ( client );
@@ -864,7 +864,7 @@ struct client *create_tcp_client ( SOCKET sock )
      * this task will find out and exit
      */
     status = setsockopt ( sock, SOL_SOCKET, SO_KEEPALIVE, 
-                    (char *) &true, sizeof (true) );
+                    (char *) &intTrue, sizeof (intTrue) );
     if ( status < 0 ) {
         errlogPrintf ( "CAS: SO_KEEPALIVE option set failed\n" );
         destroy_client ( client );
diff --git a/src/rsrv/online_notify.c b/src/rsrv/online_notify.c
index 34d91a7e6..c8c9636e9 100644
--- a/src/rsrv/online_notify.c
+++ b/src/rsrv/online_notify.c
@@ -68,7 +68,7 @@ void rsrv_online_notify_task(void *pParm)
     caHdr                       msg;
     int                         status;
     SOCKET                      sock;
-    int                         true = TRUE;
+    int                         intTrue = TRUE;
     unsigned short              port;
     ca_uint32_t                 beaconCounter = 0;
     char                        * pStr;
@@ -109,7 +109,7 @@ void rsrv_online_notify_task(void *pParm)
     }
     
     status = setsockopt (sock, SOL_SOCKET, SO_BROADCAST, 
-                (char *)&true, sizeof(true));
+                (char *)&intTrue, sizeof(intTrue));
     if (status<0) {
         errlogPrintf ("CAS: online socket set up error\n");
         epicsThreadSuspendSelf ();