diff options
| author | monty@tik.mysql.fi <> | 2001-07-16 03:04:30 +0300 |
|---|---|---|
| committer | monty@tik.mysql.fi <> | 2001-07-16 03:04:30 +0300 |
| commit | bf9876a195414ab8a5e2e1a56c5b041d807d926b (patch) | |
| tree | 12ce618a9c1f4bb3a79632d66e11232e84ab2e12 /mit-pthreads | |
| parent | cc35643e1cbe0c4a1988b3eac1ee540726f639a3 (diff) | |
| download | mariadb-git-bf9876a195414ab8a5e2e1a56c5b041d807d926b.tar.gz | |
Patch for netBSD
Added warning for tables where the auto_increment key is 0
Fixed DELETE ... LIMIT 0
Fixed UPDATE ..LIMIT 0
Diffstat (limited to 'mit-pthreads')
| -rw-r--r-- | mit-pthreads/gen/ctime.c | 2 | ||||
| -rwxr-xr-x | mit-pthreads/machdep/netbsd-1.1/__signal.h | 7 | ||||
| -rw-r--r-- | mit-pthreads/stdio/strerror.c | 7 |
3 files changed, 14 insertions, 2 deletions
diff --git a/mit-pthreads/gen/ctime.c b/mit-pthreads/gen/ctime.c index 0c1e711cf13..9b38d41e495 100644 --- a/mit-pthreads/gen/ctime.c +++ b/mit-pthreads/gen/ctime.c @@ -177,7 +177,7 @@ time_t altzone = 0; static int detzcode(const char * codep) { - long result; + int result; int i; result = 0; diff --git a/mit-pthreads/machdep/netbsd-1.1/__signal.h b/mit-pthreads/machdep/netbsd-1.1/__signal.h index e41e9218261..ea2979f2b4e 100755 --- a/mit-pthreads/machdep/netbsd-1.1/__signal.h +++ b/mit-pthreads/machdep/netbsd-1.1/__signal.h @@ -1,5 +1,7 @@ #include <sys/signal.h> +__BEGIN_DECLS + #if NSIG <= 32 #define __SIGEMPTYSET 0 #define __SIGFILLSET 0xffffffff @@ -8,6 +10,9 @@ #define __SIGISMEMBER(s, n) ((*(s) & (1 << ((n) - 1))) != 0) #else /* XXX Netbsd >= 1.3H */ + +int sigaction __P_((int, const struct sigaction *, struct sigaction *)) __RENAME(__sigaction14); + #define __SIGEMPTYSET { 0, 0, 0, 0} #define __SIGFILLSET { 0xffffffff, 0xffffffff, \ 0xffffffff, 0xffffffff } @@ -18,3 +23,5 @@ #define __SIGISMEMBER(s, n) (((s)->__bits[__SIGWORD(n)] & __SIGMASK(n)) != 0) #endif + +__END_DECLS diff --git a/mit-pthreads/stdio/strerror.c b/mit-pthreads/stdio/strerror.c index 5aea7e7a4fc..d35235e63b0 100644 --- a/mit-pthreads/stdio/strerror.c +++ b/mit-pthreads/stdio/strerror.c @@ -36,13 +36,18 @@ static char sccsid[] = "@(#)strerror.c 5.6 (Berkeley) 5/4/91"; #endif /* LIBC_SCCS and not lint */ #include <string.h> +#if defined(__NetBSD__) +#include <errno.h> +#endif char * strerror(num) int num; { +#if !defined(__NetBSD__) extern int sys_nerr; extern char *sys_errlist[]; +#endif #define UPREFIX "Unknown error: " static char ebuf[40] = UPREFIX; /* 64-bit number + slop */ register unsigned int errnum; @@ -51,7 +56,7 @@ strerror(num) errnum = num; /* convert to unsigned */ if (errnum < sys_nerr) - return(sys_errlist[errnum]); + return((char *)sys_errlist[errnum]); /* Do this by hand, so we don't include stdio(3). */ t = tmp; |