diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2006-06-21 18:35:19 +0300 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2006-06-21 18:35:19 +0300 |
| commit | e8e52a6a2557f3a6e6e3d50841eb545c9cf8d0cc (patch) | |
| tree | 2a478f6b638a6848527d7372626ac8c07dc73177 /mysys | |
| parent | 72cb1d5049c781ed82f0f0859df74383d0d62824 (diff) | |
| download | mariadb-git-e8e52a6a2557f3a6e6e3d50841eb545c9cf8d0cc.tar.gz | |
Cleanup to patch for Bug#18246, "compilation error with tcp_wrapper"
include/my_libwrap.h:
Changed includes to the header file.
mysys/my_libwrap.c:
Added comment and .c file now takes needed includes from
the corresponding .h file.
sql/mysqld.cc:
Include this block from my_libwra.h now.
Moved two variables out of the otherwise
same block.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_libwrap.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/mysys/my_libwrap.c b/mysys/my_libwrap.c index 29a0ecf3fc6..be8adbab0a1 100644 --- a/mysys/my_libwrap.c +++ b/mysys/my_libwrap.c @@ -14,14 +14,15 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/* + This is needed to be able to compile with original libwrap header + files that don't have the prototypes +*/ + #include <my_global.h> +#include <my_libwrap.h> + #ifdef HAVE_LIBWRAP -#include <tcpd.h> -#include <syslog.h> -#ifdef NEED_SYS_SYSLOG_H -#include <sys/syslog.h> -#endif /* NEED_SYS_SYSLOG_H */ -#endif void my_fromhost(struct request_info *req) { @@ -37,3 +38,5 @@ char *my_eval_client(struct request_info *req) { eval_client(req); } + +#endif /* HAVE_LIBWRAP */ |