svn commit: trunk/busybox/libbb

[landley at busybox.net]

Author: landley
Date: 2006-02-19 18:44:30 -0800 (Sun, 19 Feb 2006)
New Revision: 14138

Log:
svn 14077 was completely broken and apparently never tested.


Modified:
   trunk/busybox/libbb/xfuncs.c


Changeset:
Modified: trunk/busybox/libbb/xfuncs.c
===================================================================
--- trunk/busybox/libbb/xfuncs.c	2006-02-20 02:18:03 UTC (rev 14137)
+++ trunk/busybox/libbb/xfuncs.c	2006-02-20 02:44:30 UTC (rev 14138)
@@ -4,19 +4,7 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen at codepoet.org>
  *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <sys/types.h>
@@ -179,7 +167,9 @@
 #endif
 
 #ifdef L_strlen
-/* Stupid gcc always includes its own builtin strlen()... */
+/* Since gcc always inlines strlen(), this saves a byte or two, but we need
+ * the #undef here to avoid endless loop from #define strlen bb_strlen */
+#undef strlen
 size_t bb_strlen(const char *string)
 {
 	    return(strlen(string));