diff options
author | monty@narttu.mysql.fi <> | 2003-10-07 15:42:26 +0300 |
---|---|---|
committer | monty@narttu.mysql.fi <> | 2003-10-07 15:42:26 +0300 |
commit | 6056cfadfcb07cda12f6dc01ec9c1ab07067ac69 (patch) | |
tree | d89c080ef636608e316f1166b1628cd1d902deec /extra/resolveip.c | |
parent | 0091fa2e3266da6a17b0615a4696c25a4d36d664 (diff) | |
parent | 446d40e880c0e6ab6ac56b0082d4883ef5c7d467 (diff) | |
download | mariadb-git-6056cfadfcb07cda12f6dc01ec9c1ab07067ac69.tar.gz |
Merge with 4.0.16
Diffstat (limited to 'extra/resolveip.c')
-rw-r--r-- | extra/resolveip.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/extra/resolveip.c b/extra/resolveip.c index a9e5f16e576..12e6977c2ba 100644 --- a/extra/resolveip.c +++ b/extra/resolveip.c @@ -37,10 +37,9 @@ extern int h_errno; #endif #ifndef HAVE_IN_ADDR_T -#define in_addr_t u_long +#define in_addr_t ulong #endif - static my_bool silent; static struct my_option my_long_options[] = |