aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2003-04-16 23:02:35 +0000
committerandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2003-04-16 23:02:35 +0000
commit007ce3bfbdf8596617c16385534102497b3fb0e7 (patch)
treee7b36a8b9735a2052d3be3203162836802d1e1bb /libbb
parent45b726d00326f7d6304317144851c5dc4a0d32f4 (diff)
downloadbusybox-w32-007ce3bfbdf8596617c16385534102497b3fb0e7.tar.gz
busybox-w32-007ce3bfbdf8596617c16385534102497b3fb0e7.tar.bz2
busybox-w32-007ce3bfbdf8596617c16385534102497b3fb0e7.zip
Minor .o file naming change
git-svn-id: svn://busybox.net/trunk/busybox@6796 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'libbb')
-rw-r--r--libbb/Makefile.in2
-rw-r--r--libbb/printf.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/libbb/Makefile.in b/libbb/Makefile.in
index 4d3fd71b1..06daf232c 100644
--- a/libbb/Makefile.in
+++ b/libbb/Makefile.in
@@ -67,7 +67,7 @@ LIBBB_MOBJ1:=xmalloc.o xrealloc.o xcalloc.o xstrdup.o xstrndup.o \
67 xferror.o xferror_stdout.o xfflush_stdout.o strlen.o 67 xferror.o xferror_stdout.o xfflush_stdout.o strlen.o
68 68
69LIBBB_MSRC2:=$(LIBBB_DIR)printf.c 69LIBBB_MSRC2:=$(LIBBB_DIR)printf.c
70LIBBB_MOBJ2:=vfprintf.o vprintf.o fprintf.o printf.o 70LIBBB_MOBJ2:=bb_vfprintf.o bb_vprintf.o bb_fprintf.o bb_printf.o
71 71
72LIBBB_MSRC3:=$(LIBBB_DIR)xgetularg.c 72LIBBB_MSRC3:=$(LIBBB_DIR)xgetularg.c
73LIBBB_MOBJ3:=xgetularg_bnd_sfx.o xgetlarg_bnd_sfx.o getlarg10_sfx.o \ 73LIBBB_MOBJ3:=xgetularg_bnd_sfx.o xgetlarg_bnd_sfx.o getlarg10_sfx.o \
diff --git a/libbb/printf.c b/libbb/printf.c
index 686257699..923c5a1a4 100644
--- a/libbb/printf.c
+++ b/libbb/printf.c
@@ -125,7 +125,7 @@
125#error Your stdio library is currently not supported. Please see the commented source. 125#error Your stdio library is currently not supported. Please see the commented source.
126#endif 126#endif
127 127
128#ifdef L_vfprintf 128#ifdef L_bb_vfprintf
129extern int bb_vfprintf(FILE * __restrict stream, 129extern int bb_vfprintf(FILE * __restrict stream,
130 const char * __restrict format, 130 const char * __restrict format,
131 va_list arg) 131 va_list arg)
@@ -140,14 +140,14 @@ extern int bb_vfprintf(FILE * __restrict stream,
140} 140}
141#endif 141#endif
142 142
143#ifdef L_vprintf 143#ifdef L_bb_vprintf
144extern int bb_vprintf(const char * __restrict format, va_list arg) 144extern int bb_vprintf(const char * __restrict format, va_list arg)
145{ 145{
146 return bb_vfprintf(stdout, format, arg); 146 return bb_vfprintf(stdout, format, arg);
147} 147}
148#endif 148#endif
149 149
150#ifdef L_fprintf 150#ifdef L_bb_fprintf
151extern int bb_fprintf(FILE * __restrict stream, 151extern int bb_fprintf(FILE * __restrict stream,
152 const char * __restrict format, ...) 152 const char * __restrict format, ...)
153{ 153{
@@ -162,7 +162,7 @@ extern int bb_fprintf(FILE * __restrict stream,
162} 162}
163#endif 163#endif
164 164
165#ifdef L_printf 165#ifdef L_bb_printf
166extern int bb_printf(const char * __restrict format, ...) 166extern int bb_printf(const char * __restrict format, ...)
167{ 167{
168 va_list arg; 168 va_list arg;