aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2000-06-19 17:52:17 +0000
committerEric Andersen <andersen@codepoet.org>2000-06-19 17:52:17 +0000
commitb7362e36a80b639a64da3f662cbd0064038cad8a (patch)
treec17e459f53845aa0f79cdcba4bb8df114897a8e2
parent67e32304b1cc0ecddc045c2b0362cec3780d7fd7 (diff)
downloadbusybox-w32-b7362e36a80b639a64da3f662cbd0064038cad8a.tar.gz
busybox-w32-b7362e36a80b639a64da3f662cbd0064038cad8a.tar.bz2
busybox-w32-b7362e36a80b639a64da3f662cbd0064038cad8a.zip
printf now compiles cleanly under both libc5 and libc6.
-Erik
-rw-r--r--coreutils/printf.c3
-rw-r--r--printf.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/coreutils/printf.c b/coreutils/printf.c
index 4e9a94049..f57289759 100644
--- a/coreutils/printf.c
+++ b/coreutils/printf.c
@@ -57,7 +57,6 @@
57#include <stdlib.h> 57#include <stdlib.h>
58#include <fcntl.h> 58#include <fcntl.h>
59#include <ctype.h> 59#include <ctype.h>
60#include <libintl.h>
61 60
62 61
63#ifndef S_IFMT 62#ifndef S_IFMT
@@ -171,7 +170,7 @@ int printf_main(int argc, char **argv)
171 fprintf(stderr, "excess args ignored"); 170 fprintf(stderr, "excess args ignored");
172*/ 171*/
173 172
174 exit(exit_status); 173 return(exit_status);
175} 174}
176 175
177/* Print the text in FORMAT, using ARGV (with ARGC elements) for 176/* Print the text in FORMAT, using ARGV (with ARGC elements) for
diff --git a/printf.c b/printf.c
index 4e9a94049..f57289759 100644
--- a/printf.c
+++ b/printf.c
@@ -57,7 +57,6 @@
57#include <stdlib.h> 57#include <stdlib.h>
58#include <fcntl.h> 58#include <fcntl.h>
59#include <ctype.h> 59#include <ctype.h>
60#include <libintl.h>
61 60
62 61
63#ifndef S_IFMT 62#ifndef S_IFMT
@@ -171,7 +170,7 @@ int printf_main(int argc, char **argv)
171 fprintf(stderr, "excess args ignored"); 170 fprintf(stderr, "excess args ignored");
172*/ 171*/
173 172
174 exit(exit_status); 173 return(exit_status);
175} 174}
176 175
177/* Print the text in FORMAT, using ARGV (with ARGC elements) for 176/* Print the text in FORMAT, using ARGV (with ARGC elements) for