From a8c90a94484817429625a4028668a10761780fd2 Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Sat, 13 Mar 2004 10:22:57 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: svn://10.65.10.50/trunk@11859 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 xvaga/fstrcmp.c | 9 +--------
 xvaga/fstrcmp.h | 2 +-
 xvaga/xvaga.cpp | 2 ++
 xvaga/xvt.h     | 4 ++--
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/xvaga/fstrcmp.c b/xvaga/fstrcmp.c
index 814ead1e1..3f7ae2fcf 100755
--- a/xvaga/fstrcmp.c
+++ b/xvaga/fstrcmp.c
@@ -30,10 +30,6 @@
    Modified to work on strings rather than files
    by Peter Miller <pmiller@agso.gov.au>, October 1995 */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 /* Specification.  */
 #include "fstrcmp.h"
 
@@ -553,10 +549,7 @@ static void compareseq (int xoff, int xlim, int yoff, int ylim, int minimal)
 	strings are identical, and a number in between if they are
 	similar.  */
 
-double
-fstrcmp (string1, string2)
-     const char *string1;
-     const char *string2;
+double fstrcmp (const char * string1, const char *string2)
 {
   int i;
 
diff --git a/xvaga/fstrcmp.h b/xvaga/fstrcmp.h
index 1ba44c503..6239e2212 100755
--- a/xvaga/fstrcmp.h
+++ b/xvaga/fstrcmp.h
@@ -20,6 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #ifndef _FSTRCMP_H
 #define _FSTRCMP_H
 
-extern double fstrcmp(const char *__s1, const char *__s2);
+  double fstrcmp(const char * string1, const char *string2);
 
 #endif
diff --git a/xvaga/xvaga.cpp b/xvaga/xvaga.cpp
index 81dcf7e90..e4a05c66a 100755
--- a/xvaga/xvaga.cpp
+++ b/xvaga/xvaga.cpp
@@ -16,7 +16,9 @@
 
 #include "xvintern.h"
 #include "agasys.h"
+extern "C" {
 #include "fstrcmp.h"
+}
 
 #ifdef WIN32
 #include "oswin32.h"
diff --git a/xvaga/xvt.h b/xvaga/xvt.h
index 816242edb..0540ff8b1 100755
--- a/xvaga/xvt.h
+++ b/xvaga/xvt.h
@@ -273,8 +273,8 @@ XVTDLL int     xvt_str_compare_ignoring_case (const char* s1, const char* s2);
 XVTDLL char*   xvt_str_duplicate(const char* str);
 XVTDLL BOOLEAN xvt_str_match(const char* str, const char* pat, BOOLEAN case_sensitive);
 XVTDLL double  xvt_str_fuzzy_compare (const char* s1, const char* s2);
-XVTDLL void xvt_str_make_upper(const char* str);
-XVTDLL void xvt_str_make_lower(const char* str);
+XVTDLL void    xvt_str_make_upper(char* str);
+XVTDLL void    xvt_str_make_lower(char* str);
 
 // System calls by XVAGA
 XVTDLL void     xvt_sys_beep(int severity);