diff options
| author | unknown <kent@mysql.com> | 2005-11-06 02:19:51 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-11-06 02:19:51 +0100 |
| commit | dbfe5a961ff419d8b515532cb1008ede6f6c6d69 (patch) | |
| tree | 110a87351fc10cd11592347379f00eb49b6325f5 /cmd-line-utils/readline | |
| parent | efe3703aaca1736455541e8be8d832a6a2f65e40 (diff) | |
| download | mariadb-git-dbfe5a961ff419d8b515532cb1008ede6f6c6d69.tar.gz | |
Reapplied portability changes, from changesets by kent, joerg and msvensson
mysys/base64.c:
Portability change for SCO/HP, compiler don't like
doing pointer arithmetic on void* variable
include/my_bitmap.h:
"inline" functions (especially in header files) should be declared "static",
or else we may get "multiply defined" when they are used in several modules.
(Solaris compiler problem)
sql/handler.h:
Compatibility change for AIX compiler
storage/bdb/Makefile.in:
Added bdb "sequence" directory to "make dist"
cmd-line-utils/readline/complete.c:
Avoid FreeBSD 5.3 problems including <sys/file.h>
mysql-test/t/disabled.def:
Disable compress.test for now
storage/bdb/build_unix/.IGNORE_ME:
File that is copied to prevent empty directories in source TAR
Diffstat (limited to 'cmd-line-utils/readline')
| -rw-r--r-- | cmd-line-utils/readline/complete.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd-line-utils/readline/complete.c b/cmd-line-utils/readline/complete.c index df0a698b81f..ea459b2118c 100644 --- a/cmd-line-utils/readline/complete.c +++ b/cmd-line-utils/readline/complete.c @@ -33,7 +33,8 @@ #include <fcntl.h> -#if defined (HAVE_SYS_FILE_H) +/* FreeBSD 5.3 will not declare u_int in sys/types.h, file.h needs it */ +#if defined (HAVE_SYS_FILE_H) && !defined(__FreeBSD__) # include <sys/file.h> #endif |