Index: trunk/psLib/src/sys/psString.h
===================================================================
--- trunk/psLib/src/sys/psString.h	(revision 12757)
+++ trunk/psLib/src/sys/psString.h	(revision 12885)
@@ -11,6 +11,6 @@
  * @author Joshua Hoblitt, University of Hawaii
  *
- * @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-03-21 21:37:58 $
+ * @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-04-18 19:37:08 $
  *
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -309,13 +309,5 @@
 }
 
-#ifndef DOXYGEN
-#if NO_STRCASESTR
-// this means that the system's libc does not provide strcasestr()
-#define strcasestr(...) p_psstrcasestr(__VA_ARGS__)
-extern char *p_psstrcasestr (const char *haystack, const char *needle)
-    __THROW __attribute_pure__ __nonnull ((1, 2));
-#endif // if NO_STRCASESTR
-#endif // ifndef DOXYGEN
-
+char *psStrcasestr (const char *haystack, const char *needle);
 
 /// @}
Index: trunk/psLib/src/sys/strcasestr.c
===================================================================
--- trunk/psLib/src/sys/strcasestr.c	(revision 12757)
+++ trunk/psLib/src/sys/strcasestr.c	(revision 12885)
@@ -49,9 +49,7 @@
 #undef __strcasestr
 
-// was named __strcasestr (phaystack, pneedle)
 char *
-p_psstrcasestr (phaystack, pneedle)
-const char *phaystack;
-const char *pneedle;
+psStrcasestr(const char *phaystack,
+	     const char *pneedle)
 {
     register const unsigned char *haystack, *needle;
@@ -134,4 +132,2 @@
     return 0;
 }
-
-//weak_alias (__strcasestr, strcasestr)