Diff of pike.git/src/configure.in (07276575a8464cf92bcbc83ee49bb4fd9fcb467b » 1d6b6b01a303b4e2f1e5dbcdc23f3cd32371e1c4)

pike.git/src/configure.in:2845: # conflict. Thus check for winsock2.h before anything else in case # winsock.h is included indirectly. AC_CHECK_HEADERS(winsock2.h sys/rusage.h sys/time.h \ memory.h strings.h \ fcntl.h sys/filio.h sys/sockio.h crypt.h \ sys/select.h net/socket.h sys/param.h io.h \ sys/mman.h sys/user.h pthread.h \ sys/id.h mach-o/dyld.h sys/ptrace.h \ thread.h dlfcn.h dld.h dl.h sys/times.h sched.h \ sys/procfs.h sys/socket.h sys/uio.h fcntl.h \ - malloc.h netinet/in.h sys/wait.h windows.h grp.h pwd.h \ - passwd.h group.h winsock.h sys/file.h poll.h \ + malloc.h netinet/in.h arpa/inet.h sys/wait.h windows.h \ + grp.h pwd.h passwd.h group.h winsock.h sys/file.h poll.h \ sys/poll.h socket.h ieeefp.h fp_class.h floatingpoint.h \ sys/priocntl.h sys/sched.h winbase.h \ sys/termio.h termios.h sys/termios.h \ ws2tcpip.h valgrind/memcheck.h memcheck.h valgrind.h \ sys/prctl.h sys/ioctl.h mach/task_info.h mach/task.h \ mach/mach_init.h syscall.h sys/syscall.h devices/timer.h \ direct.h CoreServices/CoreServices.h execinfo.h \ mach/mach.h mach/thread_act.h mach/clock.h \ machine/bswap.h sys/endian.h emmintrin.h util.h,,,[ #if (defined(__WINNT__) || defined(__WIN32__)) && !defined(__NT__)
pike.git/src/configure.in:6591: #include <stdlib.h> #include <sys/types.h> #include <sys/socket.h> #include <errno.h> #include <fcntl.h> #include <signal.h> #include <sys/stat.h> #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif + #ifdef HAVE_ARPA_INET_H + #include <arpa/inet.h> + #endif #ifdef HAVE_SYS_POLL_H #include <sys/poll.h> #endif #include <fcntl.h> #ifdef HAVE_SYS_FILE_H #include <sys/file.h> #endif - + #ifdef HAVE_UNISTD_H + #include <unistd.h> + #endif #define SP_DEBUG(X) fprintf X #ifndef POLLRDNORM #define POLLRDNORM POLLIN #endif #ifndef POLLRDBAND #define POLLRDBAND POLLPRI #endif

pike.git / src / configure.in