--- rxvt-unicode/src/strings.C	2004/02/13 12:16:21	1.5
+++ rxvt-unicode/src/strings.C	2004/08/15 04:54:21	1.8
@@ -1,10 +1,10 @@
 /*--------------------------------*-C-*---------------------------------*
- * File:	strings.c
+ * File:	strings.C
  *----------------------------------------------------------------------*
- * $Id: strings.C,v 1.5 2004/02/13 12:16:21 pcg Exp $
  *
  * All portions of code are copyright by their respective author/s.
  * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
+ * Copyright (c) 2004      Marc Lehmann <pcg@goof.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,6 @@
 
 #include "../config.h"		/* NECESSARY */
 #include "rxvt.h"		/* NECESSARY */
-#include "strings.intpro"	/* PROTOS for internal routines */
 
 #ifndef NO_STRINGS
 /*----------------------------------------------------------------------*/
@@ -134,18 +133,18 @@
 char           *
 strdup (const char *s)
 {
-  size_t         len = STRLEN (s) + 1;
+  size_t         len = strlen (s) + 1;
   char          *c;
 
   if ((c = malloc (len)) != NULL)
-    MEMCPY (c, s, len);
+    memcpy (c, s, len);
   return c;
 }
 
 char           *
 index (const char *s, int c)
 {
-  return STRCHR (s, c);
+  return strchr (s, c);
 }
 
 char           *
@@ -170,7 +169,7 @@
 char           *
 rindex (const char *s, int c)
 {
-  return STRRCHR (s, c);
+  return strrchr (s, c);
 }
 
 char           *
@@ -192,7 +191,7 @@
 memcpy (void *s1, const void *s2, size_t len)
 {
   /* has extra stack and time but less code space */
-  return MEMMOVE (s1, s2, len);
+  return memmove (s1, s2, len);
 }
 
 /*--------------------------------------------------------------------------*
@@ -257,7 +256,7 @@
 void
 bzero (void *b, size_t len)
 {
-  MEMSET (b, 0, len);
+  memset (b, 0, len);
 }
 
 void           *