Merge branch 'aix-large-files' of https://github.com/bonsaiviking/libpcap into bonsai...

diff --cc scanner.l
index acc02a0a8be23fa41250aeea683330d98a1863c4,764f7cb5f2a69a0eaba7af602e3388390b8a3b6b..d149726bf2d9c5d38d2431847c4877224c4fba44
--- 1/scanner.l
--- 2/scanner.l
+++ b/scanner.l
@@@ -20,23 -27,19 +27,19 @@@
   * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   */
  
- #ifdef HAVE_CONFIG_H
- #include "config.h"
 -#ifdef WIN32
 -#include <pcap-stdinc.h>
 -#else /* WIN32 */
 -#if HAVE_INTTYPES_H
 -#include <inttypes.h>
 -#elif HAVE_STDINT_H
 -#include <stdint.h>
--#endif
- 
 -#ifdef HAVE_SYS_BITYPES_H
 -#include <sys/bitypes.h>
 +#ifdef _WIN32
 +  #include <pcap-stdinc.h>
 +#else
 +  #if HAVE_INTTYPES_H
 +    #include <inttypes.h>
 +  #elif HAVE_STDINT_H
 +    #include <stdint.h>
 +  #endif
 +  #ifdef HAVE_SYS_BITYPES_H
 +    #include <sys/bitypes.h>
 +  #endif
 +  #include <sys/types.h>
  #endif
 -#include <sys/types.h>
 -#endif /* WIN32 */
  
  #include <ctype.h>
  #include <string.h>