aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn L McGrath <bug1@ihug.co.nz>2002-09-25 06:08:19 +0000
committerGlenn L McGrath <bug1@ihug.co.nz>2002-09-25 06:08:19 +0000
commit5a66b640f963ff48a06e3649a6df76819963508b (patch)
tree30ceff6b52bad55aa348f0d15e7fe842fc7e25fa
parent69eab26401db425cf27915a675953e2ac33ee0e5 (diff)
downloadbusybox-w32-5a66b640f963ff48a06e3649a6df76819963508b.tar.gz
busybox-w32-5a66b640f963ff48a06e3649a6df76819963508b.tar.bz2
busybox-w32-5a66b640f963ff48a06e3649a6df76819963508b.zip
Reverse some minor changes that got caught up in my big unarchive patch
-rw-r--r--include/libbb.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/libbb.h b/include/libbb.h
index bd0d1e942..9dbbb47ce 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -48,6 +48,10 @@
48# include "sha1.h" 48# include "sha1.h"
49#endif 49#endif
50 50
51/* Compatability with ANSI C */
52#ifndef inline
53# define inline
54#endif
51 55
52#if (__GNU_LIBRARY__ < 5) && (!defined __dietlibc__) 56#if (__GNU_LIBRARY__ < 5) && (!defined __dietlibc__)
53/* libc5 doesn't define socklen_t */ 57/* libc5 doesn't define socklen_t */
@@ -70,9 +74,6 @@ char *strtok_r(char *s, const char *delim, char **ptrptr);
70#define BUF_SIZE 8192 74#define BUF_SIZE 8192
71#define EXPAND_ALLOC 1024 75#define EXPAND_ALLOC 1024
72 76
73static inline int is_decimal(int ch) { return ((ch >= '0') && (ch <= '9')); }
74static inline int is_octal(int ch) { return ((ch >= '0') && (ch <= '7')); }
75
76/* Macros for min/max. */ 77/* Macros for min/max. */
77#ifndef MIN 78#ifndef MIN
78#define MIN(a,b) (((a)<(b))?(a):(b)) 79#define MIN(a,b) (((a)<(b))?(a):(b))
@@ -329,7 +330,6 @@ extern char *pw_encrypt(const char *clear, const char *salt);
329extern struct spwd *pwd_to_spwd(const struct passwd *pw); 330extern struct spwd *pwd_to_spwd(const struct passwd *pw);
330extern int obscure(const char *old, const char *newval, const struct passwd *pwdp); 331extern int obscure(const char *old, const char *newval, const struct passwd *pwdp);
331 332
332//extern int xopen(const char *pathname, int flags, mode_t mode);
333extern int xopen(const char *pathname, int flags); 333extern int xopen(const char *pathname, int flags);
334extern ssize_t xread(int fd, void *buf, size_t count); 334extern ssize_t xread(int fd, void *buf, size_t count);
335extern ssize_t xread_all_eof(int fd, void *buf, size_t count); 335extern ssize_t xread_all_eof(int fd, void *buf, size_t count);