a1b0b42431
<arpa/inet.h>, but is, in some fashion, declared differently from the way we declare it in "inet_v6defs.h", but "inet_ntop()" isn't defined, so we include "inet_v6defs.h" in "inet_pton.c", which causes "inet_pton.c" not to compile as we get a collision between the two declarations. Move the declaration of "inet_aton()" to "inet_aton.h", define "NEED_INET_ATON_H" iff we didn't find "inet_aton()" in the system libraries, and include "inet_aton.h" in the callers of "inet_aton()" iff "NEED_INET_ATON_H" is defined, so that it doesn't get declared by us if "inet_aton()" is defined by a system library (which hopefully means it's declared in <arpa/inet.h> instead). svn path=/trunk/; revision=2137
47 lines
1.2 KiB
C
47 lines
1.2 KiB
C
/* acconfig.h
|
|
* #ifdefs to be controlled by "configure"
|
|
*
|
|
* $Id: acconfig.h,v 1.16 2000/07/14 07:11:52 guy Exp $
|
|
*
|
|
* Ethereal - Network traffic analyzer
|
|
* By Gerald Combs <gerald@zing.org>
|
|
* Copyright 1998 Gerald Combs
|
|
*
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#undef PACKAGE
|
|
|
|
#undef VERSION
|
|
|
|
#undef HAVE_SA_LEN
|
|
|
|
#undef DATAFILE_DIR
|
|
|
|
#undef NEED_INET_ATON_H
|
|
|
|
#undef NEED_INET_V6DEFS_H
|
|
|
|
#undef NEED_SNPRINTF_H
|
|
|
|
#undef NEED_STRERROR_H
|
|
|
|
#undef NEED_MKSTEMP
|
|
|
|
#undef HAVE_LIBPCAP
|
|
|
|
#undef PLUGIN_DIR
|