From 69115c656d7b16732f11bc5e92539ef441794c03 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Fri, 15 Sep 2006 04:01:03 +0000 Subject: [PATCH] Unbreak allbareconfig. We've had -Werror in the tree for quite a while, so adding #warning somewhat counterproductve way to make comments on the code that belong on the mailing list anyway. --- include/libbb.h | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/include/libbb.h b/include/libbb.h index 10309cff2..eee7d7dfa 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -220,9 +220,6 @@ extern int bb_fprintf(FILE * __restrict stream, const char * __restrict format, extern int bb_printf(const char * __restrict format, ...) __attribute__ ((format (printf, 1, 2))); -#if ENABLE_NITPICK -#warning rename to xferror_filename? -#endif extern void xferror(FILE *fp, const char *fn); extern void xferror_stdout(void); extern void xfflush_stdout(void); @@ -276,9 +273,6 @@ extern long bb_xgetlarg_bnd_sfx(const char *arg, int base, extern long bb_xgetlarg10_sfx(const char *arg, const struct suffix_mult *suffixes); -#if ENABLE_NITPICK -#warning pitchable now? -#endif extern unsigned long bb_xparse_number(const char *numstr, const struct suffix_mult *suffixes); @@ -340,9 +334,6 @@ char *concat_path_file(const char *path, const char *filename); char *concat_subpath_file(const char *path, const char *filename); char *last_char_is(const char *s, int c); -#if ENABLE_NITPICK -#warning yuk! -#endif char *fgets_str(FILE *file, const char *terminating_string); extern int uncompress(int fd_in, int fd_out); @@ -356,9 +347,9 @@ extern int xconnect(struct sockaddr_in *s_addr); extern unsigned short bb_lookup_port(const char *port, const char *protocol, unsigned short default_port); extern void bb_lookup_host(struct sockaddr_in *s_in, const char *host); -#if ENABLE_NITPICK -#warning wrap this? -#endif +// This is declared here rather than #including in order to avoid +// confusing the two versions of basename. See the dirname/basename man page +// for details. char *dirname (char *path); int bb_make_directory (char *path, long mode, int flags); @@ -471,9 +462,6 @@ extern int bb_default_error_retval; #endif -#if ENABLE_NITPICK -#warning put these in .o files -#endif /* The following devices are the same on devfs and non-devfs systems. */ #define CURRENT_TTY "/dev/tty" #define CONSOLE_DEV "/dev/console" -- 2.25.1