From 08af834821208230d28f94b151c0233f9ecbbede Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Wed, 17 Dec 2003 05:30:26 +0000 Subject: [PATCH] rename string.* to more unambiguous local_string_utils.* --- src/flac/Makefile.am | 2 +- src/flac/Makefile.lite | 2 +- src/flac/flac.dsp | 2 +- src/flac/{string.c => local_string_utils.c} | 0 src/flac/{string.h => local_string_utils.h} | 4 ++-- src/flac/main.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename src/flac/{string.c => local_string_utils.c} (100%) rename src/flac/{string.h => local_string_utils.h} (93%) diff --git a/src/flac/Makefile.am b/src/flac/Makefile.am index d0d9485..5daf9b4 100644 --- a/src/flac/Makefile.am +++ b/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 \ diff --git a/src/flac/Makefile.lite b/src/flac/Makefile.lite index f4c9854..7ad289d 100644 --- a/src/flac/Makefile.lite +++ b/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 diff --git a/src/flac/flac.dsp b/src/flac/flac.dsp index 40fc17e..6a3aa09 100644 --- a/src/flac/flac.dsp +++ b/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 diff --git a/src/flac/string.c b/src/flac/local_string_utils.c similarity index 100% rename from src/flac/string.c rename to src/flac/local_string_utils.c diff --git a/src/flac/string.h b/src/flac/local_string_utils.h similarity index 93% rename from src/flac/string.h rename to src/flac/local_string_utils.h index a51c3d4..71355f6 100644 --- a/src/flac/string.h +++ b/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 /* for size_t */ diff --git a/src/flac/main.c b/src/flac/main.c index 61806b7..b9fa7ee 100644 --- a/src/flac/main.c +++ b/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" -- 2.7.4