# HG changeset patch # User vimboss # Date 1106690825 0 # Node ID d6009de1268191c8b8a64837c897a87310d5f31a # Parent 5c65f9e5645919a4865b5413788bd8f18dac79c7 updated for version 7.0044 diff --git a/src/configure.in b/src/configure.in --- a/src/configure.in +++ b/src/configure.in @@ -686,19 +686,23 @@ AC_MSG_RESULT($enable_tclinterp) if test "$enable_tclinterp" = "yes"; then - dnl on FreeBSD tclsh is a silly script, look for tclsh8.0 or tclsh8.2 + dnl on FreeBSD tclsh is a silly script, look for tclsh8.[420] AC_MSG_CHECKING(--with-tclsh argument) AC_ARG_WITH(tclsh, [ --with-tclsh=PATH which tclsh to use (default: tclsh8.0)], tclsh_name="$withval"; AC_MSG_RESULT($tclsh_name), - tclsh_name="tclsh8.0"; AC_MSG_RESULT(no)) + tclsh_name="tclsh8.4"; AC_MSG_RESULT(no)) AC_PATH_PROG(vi_cv_path_tcl, $tclsh_name) AC_SUBST(vi_cv_path_tcl) - dnl when no specific version specified, also try 8.2 - if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.0"; then + dnl when no specific version specified, also try 8.2 and 8.0 + if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.4"; then tclsh_name="tclsh8.2" AC_PATH_PROG(vi_cv_path_tcl, $tclsh_name) fi + if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.2"; then + tclsh_name="tclsh8.0" + AC_PATH_PROG(vi_cv_path_tcl, $tclsh_name) + fi dnl still didn't find it, try without version number if test "X$vi_cv_path_tcl" = "X"; then tclsh_name="tclsh" @@ -744,8 +748,8 @@ if test "$enable_tclinterp" = "yes"; the dnl use eval, because tcl 8.2 includes ${TCL_DBGX} TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"` dnl Use $TCL_DEFS for -D_THREAD_SAFE et al. But only use the - dnl "-D_ABC" items. - TCL_DEFS=`echo $TCL_DEFS | tr ' ' '\012' | sed -e '/^-[[^D]]/d' -e '/-D[[^_]]/d' -e 's/-D_/ -D_/' | tr -d '\012'` + dnl "-D_ABC" items. Watch out for -DFOO=long\ long. + TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\ /\X/' | tr ' ' '\012' | sed -e '/^-[[^D]]/d' -e '/-D[[^_]]/d' -e 's/-D_/ -D_/' | tr -d '\012'` break fi done @@ -1502,6 +1506,7 @@ dnl GUI_LIB_LOC="`echo $GUI_LIB_LOC\ | AC_LANG_SAVE AC_LANG_CPLUSPLUS + AC_PROG_CXX ac_save_LIBS="$LIBS" LIBS="$GUI_LIB_LOC" ac_save_CXXFLAGS="$CXXFLAGS" @@ -2230,9 +2235,19 @@ AC_CHECK_HEADERS(stdarg.h stdlib.h strin sys/resource.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 libintl.h \ - libgen.h util/debug.h util/msg18n.h frame.h pthread_np.h \ + libgen.h util/debug.h util/msg18n.h frame.h \ sys/acl.h sys/access.h sys/sysctl.h sys/sysinfo.h wchar.h) +dnl pthread_np.h may exist but can only be used after including pthread.h +AC_MSG_CHECKING([for pthread_np.h]) +AC_TRY_COMPILE([ +#include +#include ], + [int i; i = 0;], + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_PTHREAD_NP_H), + AC_MSG_RESULT(no)) + dnl On Mac OS X strings.h exists but produces a warning message :-( if test "x$MACOSX" != "xyes"; then AC_CHECK_HEADERS(strings.h) diff --git a/src/if_cscope.h b/src/if_cscope.h --- a/src/if_cscope.h +++ b/src/if_cscope.h @@ -12,13 +12,15 @@ #if defined(FEAT_CSCOPE) || defined(PROTO) #if defined(UNIX) -#include /* pid_t */ -#include /* dev_t, ino_t */ -#elif defined (WIN32) -# ifndef WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN +# include /* pid_t */ +# include /* dev_t, ino_t */ +#else +# if defined (WIN32) +# ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +# endif +# include # endif -# include #endif #define CSCOPE_SUCCESS 0 @@ -69,12 +71,14 @@ typedef struct csi { pid_t pid; /* PID of the connected cscope process. */ dev_t st_dev; /* ID of dev containing cscope db */ ino_t st_ino; /* inode number of cscope db */ -#elif defined(WIN32) +#else +# if defined(WIN32) int pid; /* Can't get pid so set it to 0 ;) */ HANDLE hProc; /* cscope process handle */ DWORD nVolume; /* Volume serial number, instead of st_dev */ DWORD nIndexHigh; /* st_ino has no meaning in the Windows */ DWORD nIndexLow; +# endif #endif FILE * fr_fp; /* from cscope: FILE. */ diff --git a/src/proto/gui_gtk.pro b/src/proto/gui_gtk.pro --- a/src/proto/gui_gtk.pro +++ b/src/proto/gui_gtk.pro @@ -14,6 +14,7 @@ void gui_mch_destroy_scrollbar __ARGS((s char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter)); char_u *gui_mch_browsedir __ARGS((char_u *title, char_u *initdir)); int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int def_but, char_u *textfield)); +int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int def_but, char_u *textfield)); void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu)); void gui_make_popup __ARGS((char_u *path_name)); void gui_mch_find_dialog __ARGS((exarg_T *eap)); diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -372,7 +372,11 @@ static char *(features[]) = "-multi_lang", #endif #ifdef FEAT_MZSCHEME +# ifdef DYNAMIC_MZSCHEME + "+mzscheme/dyn", +# else "+mzscheme", +# endif #else "-mzscheme", #endif diff --git a/src/version.h b/src/version.h --- a/src/version.h +++ b/src/version.h @@ -36,5 +36,5 @@ #define VIM_VERSION_NODOT "vim70aa" #define VIM_VERSION_SHORT "7.0aa" #define VIM_VERSION_MEDIUM "7.0aa ALPHA" -#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2004 Jan 20)" -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2004 Jan 20, compiled " +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2004 Jan 25)" +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2004 Jan 25, compiled "