To: vim-dev@vim.org Subject: patch 5.5.048 Fcc: outbox From: Bram Moolenaar ------------ Patch 5.5.048 Problem: HP-UX 11: Compiling doesn't work, because both string.h and strings.h are included. (Squassabia) Solution: The configure test for including both string.h and strings.h must include first, because it causes problems. Files: src/configure.in, src/configure, src/config.h.in *** ../vim-5.5.47/src/configure.in Sun Sep 26 14:24:09 1999 --- src/configure.in Thu Nov 4 10:38:47 1999 *************** *** 940,952 **** fcntl.h sgtty.h sys/ioctl.h sys/time.h termio.h \ unistd.h stropts.h errno.h strings.h sys/systeminfo.h locale.h \ sys/stream.h sys/ptem.h termios.h libc.h sys/statfs.h \ ! poll.h sys/poll.h pwd.h utime.h sys/param.h) dnl Check if strings.h and string.h can both be included when defined. AC_MSG_CHECKING([if strings.h can be included after string.h]) AC_TRY_COMPILE([ #if defined(_AIX) && !defined(_NO_PROTO) # define _NO_PROTO /* like in os_unix.h, causes conflict for AIX (Winn) */ #endif #ifdef HAVE_STRING_H # include --- 940,955 ---- fcntl.h sgtty.h sys/ioctl.h sys/time.h termio.h \ unistd.h stropts.h errno.h strings.h sys/systeminfo.h locale.h \ sys/stream.h sys/ptem.h termios.h libc.h sys/statfs.h \ ! poll.h sys/poll.h pwd.h utime.h sys/param.h Xm/Xm.h) dnl Check if strings.h and string.h can both be included when defined. AC_MSG_CHECKING([if strings.h can be included after string.h]) AC_TRY_COMPILE([ #if defined(_AIX) && !defined(_NO_PROTO) # define _NO_PROTO /* like in os_unix.h, causes conflict for AIX (Winn) */ + #endif + #ifdef HAVE_XM_XM_H + # include /* This breaks it for HP-UX 11 (Squassabia) */ #endif #ifdef HAVE_STRING_H # include *** ../vim-5.5.47/src/configure Sun Sep 26 14:24:09 1999 --- src/configure Wed Dec 1 18:24:38 1999 *************** *** 3803,3823 **** fcntl.h sgtty.h sys/ioctl.h sys/time.h termio.h \ unistd.h stropts.h errno.h strings.h sys/systeminfo.h locale.h \ sys/stream.h sys/ptem.h termios.h libc.h sys/statfs.h \ ! poll.h sys/poll.h pwd.h utime.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:3825: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:3835: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* --- 3803,3823 ---- fcntl.h sgtty.h sys/ioctl.h sys/time.h termio.h \ unistd.h stropts.h errno.h strings.h sys/systeminfo.h locale.h \ sys/stream.h sys/ptem.h termios.h libc.h sys/statfs.h \ ! poll.h sys/poll.h pwd.h utime.h sys/param.h Xm/Xm.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:3811: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:3821: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* *************** *** 3845,3858 **** echo $ac_n "checking if strings.h can be included after string.h""... $ac_c" 1>&6 ! echo "configure:3863: checking if strings.h can be included after string.h" >&5 cat > conftest.$ac_ext < #endif --- 3845,3861 ---- echo $ac_n "checking if strings.h can be included after string.h""... $ac_c" 1>&6 ! echo "configure:3849: checking if strings.h can be included after string.h" >&5 cat > conftest.$ac_ext < /* This breaks it for HP-UX 11 (Squassabia) */ + #endif #ifdef HAVE_STRING_H # include #endif *** ../vim-5.5.47/src/config.h.in Wed Sep 22 10:06:20 1999 --- src/config.h.in Wed Nov 3 22:25:16 1999 *************** *** 274,279 **** --- 274,282 ---- /* Define if you have the header file. */ #undef HAVE_STRINGS_H + /* Define if you have the header file (only used by configure). */ + #undef HAVE_XM_XM_H + /* Define if strings.h cannot be included when strings.h already is */ #undef NO_STRINGS_WITH_STRING_H *** ../vim-5.5.47/src/version.c Sat Dec 4 13:59:43 1999 --- src/version.c Sat Dec 4 14:06:39 1999 *************** *** 420,420 **** --- 420,421 ---- { /* Add new patch number below this line */ + 48, -- hundred-and-one symptoms of being an internet addict: 233. You start dreaming about web pages...in html. --/-/---- Bram Moolenaar ---- Bram@moolenaar.net ---- Bram@vim.org ---\-\-- \ \ www.vim.org/iccf www.moolenaar.net www.vim.org / /