From e16dc7852e80b574db965c5cb3ec629bc0c42d37 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Tue, 28 Nov 2006 18:00:37 +0000
Subject: [PATCH] Fixed gcc warnings.

---
 src/libCom/misc/epicsString.c | 6 +++---
 src/libCom/misc/epicsString.h | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/libCom/misc/epicsString.c b/src/libCom/misc/epicsString.c
index da165ce97..83a3ea3fb 100644
--- a/src/libCom/misc/epicsString.c
+++ b/src/libCom/misc/epicsString.c
@@ -239,7 +239,7 @@ epicsShareFunc int epicsStrGlobMatch(
 
 epicsShareFunc char * epicsStrtok_r(char *s, const char *delim, char **lasts)
 {
-   char *spanp;
+   const char *spanp;
    int c, sc;
    char *tok;
 
@@ -252,7 +252,7 @@ epicsShareFunc char * epicsStrtok_r(char *s, const char *delim, char **lasts)
     */
 cont:
    c = *s++;
-   for (spanp = (char *)delim; (sc = *spanp++) != 0;) {
+   for (spanp = delim; (sc = *spanp++) != 0;) {
       if (c == sc)
          goto cont;
    }
@@ -269,7 +269,7 @@ cont:
     */
    for (;;) {
       c = *s++;
-      spanp = (char *)delim;
+      spanp = delim;
       do {
          if ((sc = *spanp++) == c) {
             if (c == 0)
diff --git a/src/libCom/misc/epicsString.h b/src/libCom/misc/epicsString.h
index 6da7260fa..c6b84211c 100644
--- a/src/libCom/misc/epicsString.h
+++ b/src/libCom/misc/epicsString.h
@@ -16,6 +16,9 @@
  * returns the length of the resultant string (may contain nulls)
 */
 
+#ifndef INC_epicsString_H
+#define INC_epicsString_H
+
 #include <stdio.h>
 #include <shareLib.h>
 
@@ -40,3 +43,4 @@ epicsShareFunc char * epicsStrtok_r(
 }
 #endif
 
+#endif /* INC_epicsString_H */