From 9f6213e6b7991280ef82a210684a1a5a66671fa7 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sun, 9 Mar 2003 16:45:20 +0000 Subject: merge from trunk --- winsup/cygwin/ChangeLog | 4 ++++ winsup/cygwin/Makefile.in | 36 +++++++++++++++-------------------- winsup/cygwin/include/cygwin/socket.h | 2 +- 3 files changed, 20 insertions(+), 22 deletions(-) (limited to 'winsup/cygwin') diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index ec0bc21..1d02767 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2003-03-09 Corinna Vinschen + + * include/cygwin/socket.h: Set SOMAXCONN to Winsock2 value. + 2003-03-08 Christopher Faylor * syscalls.cc (unlink): Always attempt to use FILE_FLAG_CLOSE_ON_DELETE diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index cb5c39d..f8507ed 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -49,7 +49,6 @@ DEFS:=@DEFS@ # cygheap_CFLAGS:=-fomit-frame-pointer malloc_CFLAGS:=-fomit-frame-pointer -malloc_wrapper_CFLAGS:=-fomit-frame-pointer shared_CFLAGS:=-fomit-frame-pointer cygthread_CFLAGS:=-fomit-frame-pointer miscfuncs_CFLAGS:=-fomit-frame-pointer @@ -115,12 +114,14 @@ RUNTEST = `if [ -f $${srcdir}/../dejagnu/runtest ] ; then \ RUNTESTFLAGS = # Parameters used in building the cygwin.dll. -# We build as new-cygwin.dll and rename at install time to overcome +# We build as cygwin0.dll and rename at install time to overcome # native rebuilding issues (we don't want the build tools to see a partially # built cygwin.dll and attempt to use it instead of the old one). DLL_NAME:=cygwin1.dll +TEST_DLL_NAME:=cygwin0.dll LIB_NAME:=libcygwin.a +TEST_LIB_NAME:=libcygwin0.a DEF_FILE:=cygwin.def DLL_ENTRY:=@DLL_ENTRY@ @@ -144,17 +145,16 @@ MALLOC_OFILES=@MALLOC_OFILES@ DLL_IMPORTS:=$(w32api_lib)/libkernel32.a -MT_SAFE_OBJECTS:= # Please maintain this list in sorted order, with maximum files per 80 col line DLL_OFILES:=assert.o autoload.o cxx.o cygheap.o cygserver_client.o \ cygserver_transport.o cygserver_transport_pipes.o \ cygserver_transport_sockets.o cygthread.o dcrt0.o debug.o \ - delqueue.o devices.o dir.o dlfcn.o dll_init.o dtable.o environ.o errno.o \ + delqueue.o dir.o dlfcn.o dll_init.o dtable.o environ.o errno.o \ exceptions.o exec.o external.o fcntl.o fhandler.o \ fhandler_clipboard.o fhandler_console.o fhandler_disk_file.o \ - fhandler_dsp.o fhandler_fifo.o fhandler_floppy.o fhandler_mem.o \ - fhandler_nodevice.o fhandler_proc.o fhandler_process.o \ - fhandler_random.o fhandler_raw.o fhandler_registry.o fhandler_serial.o \ + fhandler_dsp.o fhandler_floppy.o fhandler_mem.o \ + fhandler_proc.o fhandler_process.o fhandler_random.o \ + fhandler_raw.o fhandler_registry.o fhandler_serial.o \ fhandler_socket.o fhandler_tape.o fhandler_termios.o \ fhandler_tty.o fhandler_virtual.o fhandler_windows.o \ fhandler_zero.o fnmatch.o fork.o glob.o grp.o heap.o init.o ioctl.o \ @@ -196,7 +196,7 @@ all: all_target $(all_host) all_target: $(TARGET_LIBS) cygserver.exe -all_host: new-$(LIB_NAME) +all_host: $(TEST_LIB_NAME) force: @@ -206,7 +206,7 @@ install: install-libs install-headers install-man install_target \ uninstall: uninstall-libs uninstall-headers uninstall-man install-libs: $(TARGET_LIBS) - $(INSTALL_DATA) new-$(DLL_NAME) $(bindir)/$(DLL_NAME); \ + $(INSTALL_DATA) $(TEST_DLL_NAME) $(bindir)/$(DLL_NAME); \ for i in $^; do \ $(INSTALL_DATA) $$i $(tooldir)/lib/`basename $$i` ; \ done @@ -281,26 +281,25 @@ maintainer-clean realclean: clean # Rule to build cygwin.dll -new-$(DLL_NAME): $(LDSCRIPT) $(DLL_OFILES) $(DEF_FILE) $(DLL_IMPORTS) $(LIBC) $(LIBM) $(API_VER) Makefile winver_stamp +$(TEST_DLL_NAME): $(LDSCRIPT) $(DLL_OFILES) $(DEF_FILE) $(DLL_IMPORTS) $(LIBC) $(LIBM) $(API_VER) Makefile winver_stamp $(CXX) $(CXXFLAGS) -nostdlib -Wl,-T$(firstword $^) -Wl,--out-implib,cygdll.a -shared -o $@ \ -e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o winver.o \ $(MALLOC_OBJ) $(LIBM) $(LIBC) \ -lgcc $(DLL_IMPORTS) + @ln $@ new-$(DLL_NAME) # Rule to build libcygwin.a -$(LIB_NAME): rmsym newsym new-$(DLL_NAME) $(LIBCOS) +$(LIB_NAME): rmsym newsym $(TEST_DLL_NAME) $(LIBCOS) /bin/sh ${word 1,$^} ./cygdll.a "$(NM)" "$(AR)" "$(RANLIB)" $(OBSOLETE_FUNCTIONS) || exit 0 /bin/sh ${word 2,$^} ./cygdll.a "$(AS)" "$(AR)" "$(RANLIB)" $(NEW_FUNCTIONS) || exit 0 (echo create $(LIB_NAME); echo addmod $(LIBCOS); echo addlib cygdll.a; echo save) | $(AR) -M + $(RANLIB) $@ # Rule to make stub library used by testsuite # dependency set to $(LIB_NAME) to accommodate make -j2. # Otherwise dlltool gets confused. cgf (11-16-2000) -new-$(LIB_NAME): $(LIB_NAME) - $(DLLTOOL) --as=$(AS) --dllname new-$(DLL_NAME) --def $(DEF_FILE) --output-lib new-templib.a - $(AR) rcv new-templib.a $(LIBCOS) - mv new-templib.a new-$(LIB_NAME) - $(RANLIB) $@ +$(TEST_LIB_NAME): $(LIB_NAME) + perl -p -e 'BEGIN{binmode(STDIN); binmode(STDOUT);}; s/cygwin1/cygwin0/g' < $? > $@ dll_ofiles: $(DLL_OFILES) @@ -354,11 +353,6 @@ cygserver_transport_sockets_outside.o: cygserver_transport_sockets.cc cygserver_client_outside.o: cygserver_client.cc $(COMPILE_CXX) -D__OUTSIDE_CYGWIN__ -o $@ $< -# gperf -c --key-positions='1-126' -r -t -C -E -L 'ANSI-C' -Hdevhash -N'device::lookup' -Z devstring -7 $? |\ - -$(srcdir)/devices.cc: cygwin-gperf devices.gperf devices.h - $^ > $@ - cygserver.exe: cygserver.o cygserver_shm.o cygserver_transport_outside.o cygserver_transport_pipes_outside.o cygserver_transport_sockets_outside.o cygserver_client_outside.o cygserver_process.o threaded_queue.o wincap.o version.o smallprint.o $(CXX) -o $@ $^ -lstdc++ #ifdef VERBOSE diff --git a/winsup/cygwin/include/cygwin/socket.h b/winsup/cygwin/include/cygwin/socket.h index 3a40c12..f89a8ed 100644 --- a/winsup/cygwin/include/cygwin/socket.h +++ b/winsup/cygwin/include/cygwin/socket.h @@ -106,7 +106,7 @@ struct msghdr #define PF_MAX AF_MAX /* Maximum queue length specificable by listen. */ -#define SOMAXCONN 5 +#define SOMAXCONN 0x7fffffff /* Flags we can use with send/ and recv. */ #define MSG_OOB 0x1 /* process out-of-band data */ -- cgit v1.1