From d6e61d2a5a4db5b3d950777b1e2b59c365b94d5e Mon Sep 17 00:00:00 2001 From: drdani Date: Thu, 21 Sep 2000 07:10:36 +0000 Subject: [PATCH] New version: 0.2.37 it fixes socklen_t, third param of accept(), and do not compile gui part at all git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@396 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- sim/ucsim/.version | 2 +- sim/ucsim/Makefile | 7 +- sim/ucsim/avr.src/clean.mk | 1 + sim/ucsim/cmd.src/newcmd.cc | 2 +- sim/ucsim/conf.mk | 5 +- sim/ucsim/configure | 227 +++++++++++++++++++--------------- sim/ucsim/configure.in | 58 ++------- sim/ucsim/ddconfig_in.h | 1 + sim/ucsim/gui.src/Makefile.in | 3 +- sim/ucsim/pobj.cc | 4 +- 10 files changed, 156 insertions(+), 154 deletions(-) diff --git a/sim/ucsim/.version b/sim/ucsim/.version index 37483e84..aa049997 100644 --- a/sim/ucsim/.version +++ b/sim/ucsim/.version @@ -1 +1 @@ -0.2.37-pre5 +0.2.37 diff --git a/sim/ucsim/Makefile b/sim/ucsim/Makefile index 5b69d993..9758b22e 100644 --- a/sim/ucsim/Makefile +++ b/sim/ucsim/Makefile @@ -9,7 +9,8 @@ STARTYEAR = 1997 SHELL = /bin/sh PRJDIR = . -PKGS = cmd.src sim.src s51.src avr.src z80.src gui.src doc +PKGS = cmd.src sim.src s51.src avr.src z80.src doc +#gui.src srcdir = . @@ -137,6 +138,10 @@ print-newer: exit 1 ;\ fi +new_files: + diff -rNu $$HOME/clean-source/sdcc/sim/ucsim .|\ + grep '^diff' | grep -v CVS | awk '{print $$4}' + lines: @find . \( -name '*.[ch]' -o -name '*.cc' -o -name '*.hh' \) \ -exec cat {} \; | clines diff --git a/sim/ucsim/avr.src/clean.mk b/sim/ucsim/avr.src/clean.mk index 268e437b..ca50e5f4 100644 --- a/sim/ucsim/avr.src/clean.mk +++ b/sim/ucsim/avr.src/clean.mk @@ -13,6 +13,7 @@ clean: distclean: clean rm -f config.cache config.log config.status rm -f Makefile *.dep + rm -f *.obj *.list *.lst *.hex # Like clean but some files may still exist diff --git a/sim/ucsim/cmd.src/newcmd.cc b/sim/ucsim/cmd.src/newcmd.cc index cee73544..3c37a9b8 100644 --- a/sim/ucsim/cmd.src/newcmd.cc +++ b/sim/ucsim/cmd.src/newcmd.cc @@ -840,7 +840,7 @@ int cl_listen_console::proc_input(void) { int newsock; - uint size; + SOCKLEN_T size; struct sockaddr_in sock_addr; size= sizeof(struct sockaddr); diff --git a/sim/ucsim/conf.mk b/sim/ucsim/conf.mk index b7d8f08e..faf32470 100644 --- a/sim/ucsim/conf.mk +++ b/sim/ucsim/conf.mk @@ -2,7 +2,7 @@ # Makefile targets to remake configuration # -freshconf: $(srcdir)/configure main.mk +freshconf: $(srcdir)/configure main.mk ddconfig.h $(srcdir)/configure: $(srcdir)/configure.in cd $(srcdir) && $(SHELL) autoconf @@ -10,6 +10,9 @@ $(srcdir)/configure: $(srcdir)/configure.in main.mk: $(srcdir)/main_in.mk $(srcdir)/configure.in $(SHELL) ./config.status +ddconfig.h: ddconfig_in.h config.status + $(SHELL) ./config.status + config.status: $(srcdir)/configure $(SHELL) ./config.status --recheck diff --git a/sim/ucsim/configure b/sim/ucsim/configure index eb9b1628..5658e6a3 100755 --- a/sim/ucsim/configure +++ b/sim/ucsim/configure @@ -1128,10 +1128,32 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then #define SOCKET_AVAIL 1 EOF - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_SYS_SOCKET_H 1 +EOF + + cat > conftest.$ac_ext < +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "socklen_t" >/dev/null 2>&1; then + rm -rf conftest* + cat >> confdefs.h <> confdefs.h <&6 fi @@ -1141,12 +1163,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:1145: checking for $ac_hdr that defines DIR" >&5 +echo "configure:1167: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -1154,7 +1176,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1179,7 +1201,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:1183: checking for opendir in -ldir" >&5 +echo "configure:1205: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1187,7 +1209,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1223,7 +1245,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:1227: checking for opendir in -lx" >&5 +echo "configure:1249: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1231,7 +1253,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1271,13 +1293,13 @@ fi # This must be after CXXCPP echo $ac_n "checking which header file defines FD_ macros""... $ac_c" 1>&6 -echo "configure:1275: checking which header file defines FD_ macros" >&5 +echo "configure:1297: checking which header file defines FD_ macros" >&5 if eval "test \"`echo '$''{'s51_cv_fd'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else s51_cv_fd="unknown" cat > conftest.$ac_ext < @@ -1293,7 +1315,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < @@ -1309,7 +1331,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < @@ -1386,11 +1408,8 @@ EOF # Checking for functions/libs # =========================================================================== - - - echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:1394: checking for socket in -lsocket" >&5 +echo "configure:1413: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1398,7 +1417,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1440,7 +1459,7 @@ else fi echo $ac_n "checking for xdr_short in -lnsl""... $ac_c" 1>&6 -echo "configure:1444: checking for xdr_short in -lnsl" >&5 +echo "configure:1463: checking for xdr_short in -lnsl" >&5 ac_lib_var=`echo nsl'_'xdr_short | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1448,7 +1467,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1490,7 +1509,7 @@ else fi echo $ac_n "checking for panel_above in -lpanel""... $ac_c" 1>&6 -echo "configure:1494: checking for panel_above in -lpanel" >&5 +echo "configure:1513: checking for panel_above in -lpanel" >&5 ac_lib_var=`echo panel'_'panel_above | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1498,7 +1517,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpanel -lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1535,7 +1554,7 @@ else echo "$ac_t""no" 1>&6 panel_ok="no" echo $ac_n "checking for nl in -lcurses""... $ac_c" 1>&6 -echo "configure:1539: checking for nl in -lcurses" >&5 +echo "configure:1558: checking for nl in -lcurses" >&5 ac_lib_var=`echo curses'_'nl | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1543,7 +1562,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1588,12 +1607,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:1592: checking for vprintf" >&5 +echo "configure:1611: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -1643,12 +1662,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:1647: checking for _doprnt" >&5 +echo "configure:1666: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -1698,13 +1717,18 @@ fi fi -echo $ac_n "checking for vasprintf""... $ac_c" 1>&6 -echo "configure:1703: checking for vasprintf" >&5 -cat > conftest.$ac_ext <&6 +echo "configure:1724: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -1712,47 +1736,54 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char vasprintf(); +char $ac_func(); int main() { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_vasprintf) || defined (__stub___vasprintf) +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -vasprintf(); +$ac_func(); #endif ; return 0; } EOF -if { (eval echo configure:1731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_func_vasprintf=yes" + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_func_vasprintf=no" + eval "ac_cv_func_$ac_func=no" fi rm -f conftest* -if eval "test \"`echo '$ac_cv_func_'vasprintf`\" = yes"; then +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - : + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 fi +done for ac_func in strlen strcpy strcat strstr strcmp strerror strtok strdup do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1751: checking for $ac_func" >&5 +echo "configure:1782: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1802,15 +1833,15 @@ else fi done -for ac_func in vsnprintf strchr memcpy +for ac_func in strchr memcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1809: checking for $ac_func" >&5 +echo "configure:1840: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1863,12 +1894,12 @@ done for ac_func in fgets do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1867: checking for $ac_func" >&5 +echo "configure:1898: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1921,12 +1952,12 @@ done for ac_func in yylex do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1925: checking for $ac_func" >&5 +echo "configure:1956: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1978,7 +2009,7 @@ done echo $ac_n "checking whether scanf knows %a""... $ac_c" 1>&6 -echo "configure:1982: checking whether scanf knows %a" >&5 +echo "configure:2013: checking whether scanf knows %a" >&5 if eval "test \"`echo '$''{'s51_cv_scanf_a'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1987,7 +2018,7 @@ if test "$cross_compiling" = yes; then s51_cv_scanf_a="unknown" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then s51_cv_scanf_a="yes" else @@ -2034,7 +2065,7 @@ EOF fi echo $ac_n "checking whether getcwd is GNUish""... $ac_c" 1>&6 -echo "configure:2038: checking whether getcwd is GNUish" >&5 +echo "configure:2069: checking whether getcwd is GNUish" >&5 if eval "test \"`echo '$''{'s51_cv_getcwd'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2042,7 +2073,7 @@ else s51_cv_getcwd="unknown" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then s51_cv_getcwd="yes" else @@ -2093,14 +2124,14 @@ fi # Checking characteristics of compilers and other programs # -------------------------------------------------------- echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:2097: checking whether byte ordering is bigendian" >&5 +echo "configure:2128: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -2111,11 +2142,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:2115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -2126,7 +2157,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:2130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -2146,7 +2177,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -2186,7 +2217,7 @@ EOF fi echo $ac_n "checking whether preprocessor accepts -MM or -M""... $ac_c" 1>&6 -echo "configure:2190: checking whether preprocessor accepts -MM or -M" >&5 +echo "configure:2221: checking whether preprocessor accepts -MM or -M" >&5 if eval "test \"`echo '$''{'s51_cv_MM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2209,7 +2240,7 @@ M_OR_MM=$s51_cv_MM echo $ac_n "checking whether $CXX accepts -ggdb""... $ac_c" 1>&6 -echo "configure:2213: checking whether $CXX accepts -ggdb" >&5 +echo "configure:2244: checking whether $CXX accepts -ggdb" >&5 if eval "test \"`echo '$''{'s51_cv_CXXggdb'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2238,7 +2269,7 @@ fi echo $ac_n "checking whether $CXX accepts -pipe""... $ac_c" 1>&6 -echo "configure:2242: checking whether $CXX accepts -pipe" >&5 +echo "configure:2273: checking whether $CXX accepts -pipe" >&5 if eval "test \"`echo '$''{'s51_cv_CXXpipe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2266,12 +2297,12 @@ fi # =========================================================================== echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2270: checking return type of signal handlers" >&5 +echo "configure:2301: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2288,7 +2319,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:2292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2307,7 +2338,7 @@ EOF echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:2311: checking size of char" >&5 +echo "configure:2342: checking size of char" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2315,7 +2346,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_char=`cat conftestval` else @@ -2349,7 +2380,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:2353: checking size of short" >&5 +echo "configure:2384: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2357,7 +2388,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -2391,7 +2422,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:2395: checking size of int" >&5 +echo "configure:2426: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2399,7 +2430,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -2433,7 +2464,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:2437: checking size of long" >&5 +echo "configure:2468: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2441,7 +2472,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -2475,7 +2506,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:2479: checking size of long long" >&5 +echo "configure:2510: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2483,7 +2514,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -2543,15 +2574,15 @@ type_name() } echo $ac_n "checking type name for byte""... $ac_c" 1>&6 -echo "configure:2547: checking type name for byte" >&5 +echo "configure:2578: checking type name for byte" >&5 TYPE_BYTE=`type_name 1` echo "$ac_t""$TYPE_BYTE" 1>&6 echo $ac_n "checking type name for word""... $ac_c" 1>&6 -echo "configure:2551: checking type name for word" >&5 +echo "configure:2582: checking type name for word" >&5 TYPE_WORD=`type_name 2` echo "$ac_t""$TYPE_WORD" 1>&6 echo $ac_n "checking type name for dword""... $ac_c" 1>&6 -echo "configure:2555: checking type name for dword" >&5 +echo "configure:2586: checking type name for dword" >&5 TYPE_DWORD=`type_name 4` echo "$ac_t""$TYPE_DWORD" 1>&6 cat >> confdefs.h < because on OSF/1 3.0 it includes -dnl which includes which contains a prototype for -dnl select. Similarly for bzero. -[/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $1(); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -]ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus -extern "C" -#endif -])dnl -[/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $1(); -], [ -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$1) || defined (__stub___$1) -choke me -#else -$1(); -#endif -], eval "ac_cv_func_$1=yes", eval "ac_cv_func_$1=no") -if eval "test \"`echo '$ac_cv_func_'$1`\" = yes"; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) -else - AC_MSG_RESULT(no) -ifelse([$3], , , [$3 -])dnl -fi -]) - AC_CHECK_LIB(socket,socket) AC_CHECK_LIB(nsl,xdr_short) AC_CHECK_LIB(panel,panel_above, @@ -153,16 +120,9 @@ AC_SUBST(curses_ok) AC_SUBST(CURSES_LIBS) AC_FUNC_VPRINTF -dnl Do not cache the result of the vasprintf test. -dnl This is because vasprintf is defined in the C++ runtime -dnl for egcs, but not in the C runtime. Thus, caching the result -dnl of this test (which is done with C++) will cause later C -dnl based tests to falsely conclude that vasprintf is available -dnl to C programs. -dnl It's a bloody stupid function anyway. -AC_CHECK_FUNC_NOCACHE(vasprintf) +AC_CHECK_FUNCS(vsnprintf vasprintf) AC_CHECK_FUNCS(strlen strcpy strcat strstr strcmp strerror strtok strdup) -AC_CHECK_FUNCS(vsnprintf strchr memcpy) +AC_CHECK_FUNCS(strchr memcpy) dnl AC_CHECK_FUNCS(getline) dnl AC_CHECK_FUNCS(getdelim) AC_CHECK_FUNCS(fgets) diff --git a/sim/ucsim/ddconfig_in.h b/sim/ucsim/ddconfig_in.h index a41420eb..ab93132e 100644 --- a/sim/ucsim/ddconfig_in.h +++ b/sim/ucsim/ddconfig_in.h @@ -42,6 +42,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #undef HAVE_NDIR_H #undef SOCKET_AVAIL +#undef SOCKLEN_T #undef FD_NEED_TIME_H #undef FD_NEED_TYPES_H diff --git a/sim/ucsim/gui.src/Makefile.in b/sim/ucsim/gui.src/Makefile.in index eaf7843b..b91fd8bf 100644 --- a/sim/ucsim/gui.src/Makefile.in +++ b/sim/ucsim/gui.src/Makefile.in @@ -35,7 +35,8 @@ man2dir = $(mandir)/man2 infodir = @infodir@ srcdir = @srcdir@ -PKGS = serio.src portmon.src +PKGS = +# serio.src portmon.src LOBJECTS = event.o \ view.o frame.o bg.o label.o \ diff --git a/sim/ucsim/pobj.cc b/sim/ucsim/pobj.cc index 20af199c..2149ecd7 100644 --- a/sim/ucsim/pobj.cc +++ b/sim/ucsim/pobj.cc @@ -248,7 +248,7 @@ cl_list::for_each(iterator_func action, void *arg) void cl_list::free_item(void *item) { - delete item; + delete (class cl_base*)item; } @@ -536,7 +536,7 @@ cl_strings::compare(void *key1, void *key2) void cl_strings::free_item(void* item) { - delete item; + delete (class cl_base*)item; } -- 2.30.2