emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverse some minor changes that got caught up in my big unarchive patch

Browse Source
This commit is contained in:
Glenn L McGrath 2002-09-25 06:08:19 +00:00
parent 69eab26401
commit 5a66b640f9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/libbb.h
View File

@ -48,6 +48,10 @@
# include "sha1.h" # include "sha1.h"
#endif #endif
/* Compatability with ANSI C */
#ifndef inline
# define inline
#endif
#if (__GNU_LIBRARY__ < 5) && (!defined __dietlibc__) #if (__GNU_LIBRARY__ < 5) && (!defined __dietlibc__)
/* libc5 doesn't define socklen_t */ /* libc5 doesn't define socklen_t */
@ -70,9 +74,6 @@ char *strtok_r(char *s, const char *delim, char **ptrptr);
#define BUF_SIZE 8192 #define BUF_SIZE 8192
#define EXPAND_ALLOC 1024 #define EXPAND_ALLOC 1024
static inline int is_decimal(int ch) { return ((ch >= '0') && (ch <= '9')); }
static inline int is_octal(int ch) { return ((ch >= '0') && (ch <= '7')); }
/* Macros for min/max. */ /* Macros for min/max. */
#ifndef MIN #ifndef MIN
#define MIN(a,b) (((a)<(b))?(a):(b)) #define MIN(a,b) (((a)<(b))?(a):(b))
@ -329,7 +330,6 @@ extern char *pw_encrypt(const char *clear, const char *salt);
extern struct spwd *pwd_to_spwd(const struct passwd *pw); extern struct spwd *pwd_to_spwd(const struct passwd *pw);
extern int obscure(const char *old, const char *newval, const struct passwd *pwdp); extern int obscure(const char *old, const char *newval, const struct passwd *pwdp);
//extern int xopen(const char *pathname, int flags, mode_t mode);
extern int xopen(const char *pathname, int flags); extern int xopen(const char *pathname, int flags);
extern ssize_t xread(int fd, void *buf, size_t count); extern ssize_t xread(int fd, void *buf, size_t count);
extern ssize_t xread_all_eof(int fd, void *buf, size_t count); extern ssize_t xread_all_eof(int fd, void *buf, size_t count);