rename string.* to more unambiguous local_string_utils.*

src/flac/Makefile.am

@@ -31,7 +31,7 @@ flac_SOURCES = \
 	decode.c \
 	encode.c \
 	main.c \
-	string.c \
+	local_string_utils.c \
 	utils.c \
 	vorbiscomment.c \
 	analyze.h \

src/flac/Makefile.lite

@@ -41,8 +41,8 @@ SRCS_C = \
 	analyze.c \
 	decode.c \
 	encode.c \
+	local_string_utils.c \
 	main.c \
-	string.c \
 	utils.c \
 	vorbiscomment.c
 

src/flac/flac.dsp

@@ -105,7 +105,7 @@ SOURCE=.\main.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\string.c
+SOURCE=.\local_string_utils.c
 # End Source File
 # Begin Source File
 

src/flac/string.h → src/flac/local_string_utils.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifndef flac__string_h
-#define flac__string_h
+#ifndef flac__local_string_utils_h
+#define flac__local_string_utils_h
 
 #include <stdlib.h> /* for size_t */
 

src/flac/main.c

@@ -38,7 +38,7 @@
 #include "analyze.h"
 #include "decode.h"
 #include "encode.h"
-#include "string.h" /* for strlcat() and strlcpy() */
+#include "local_string_utils.h" /* for flac__strlcat() and flac__strlcpy() */
 #include "utils.h"
 #include "vorbiscomment.h"