To:
[email protected]
Subject: Patch 6.2f.007
Fcc: outbox
From: Bram Moolenaar <
[email protected]>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------
Patch 6.2f.007
Problem: Irix compiler complains about multiple defined symbols.
vsnprintf() is not available. (Charles Campbell)
Solution: Insert EXTERN for variables in globals.h. Change the configure
check for vsnprintf() from compiling to linking.
Files: src/auto/configure, src/configure.in, src/globals.h
*** ../vim-6.2f.006/src/auto/configure Mon May 26 22:15:33 2003
--- src/auto/configure Tue May 27 19:26:42 2003
***************
*** 2156,2162 ****
; return 0; }
EOF
! if { (eval echo configure:2160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
--- 2156,2162 ----
; return 0; }
EOF
! if { (eval echo configure:2160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
*** ../vim-6.2f.006/src/configure.in Mon May 26 22:15:33 2003
--- src/configure.in Tue May 27 19:24:20 2003
***************
*** 627,633 ****
AC_MSG_RESULT($disable_netbeans)
if test "$disable_netbeans" = "no"; then
AC_MSG_CHECKING(whether compiling netbeans integration is possible)
! AC_TRY_COMPILE([
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
--- 627,633 ----
AC_MSG_RESULT($disable_netbeans)
if test "$disable_netbeans" = "no"; then
AC_MSG_CHECKING(whether compiling netbeans integration is possible)
! AC_TRY_LINK([
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
*** ../vim-6.2f.006/src/globals.h Mon May 26 22:15:06 2003
--- src/globals.h Tue May 27 19:20:20 2003
***************
*** 1144,1157 ****
#endif
#ifdef FEAT_NETBEANS_INTG
! char *netbeansArg INIT(= 0); /* the -nb[:host:port:passwd] arg */
! int netbeansCloseFile INIT(= 0); /* send killed if != 0 */
! int netbeansFireChanges INIT(= 1); /* send buffer changes if != 0 */
! int netbeansForcedQuit INIT(= 0); /* don't write modified files */
! int netbeansOpenFile INIT(= 1); /* send fileOpened if != 0 */
! int netbeansReadFile INIT(= 1); /* OK to read from disk if != 0 */
! int netbeansSuppressNoLines INIT(= 0); /* don't put out "No lines in buffer" */
! int usingNetbeans INIT(= 0); /* set if -nb flag is used */
#endif
/*
--- 1144,1157 ----
#endif
#ifdef FEAT_NETBEANS_INTG
! EXTERN char *netbeansArg INIT(= 0); /* the -nb[:host:port:passwd] arg */
! EXTERN int netbeansCloseFile INIT(= 0); /* send killed if != 0 */
! EXTERN int netbeansFireChanges INIT(= 1); /* send buffer changes if != 0 */
! EXTERN int netbeansForcedQuit INIT(= 0);/* don't write modified files */
! EXTERN int netbeansOpenFile INIT(= 1); /* send fileOpened if != 0 */
! EXTERN int netbeansReadFile INIT(= 1); /* OK to read from disk if != 0 */
! EXTERN int netbeansSuppressNoLines INIT(= 0); /* skip "No lines in buffer" */
! EXTERN int usingNetbeans INIT(= 0); /* set if -nb flag is used */
#endif
/*
*** ../vim-6.2f.006/src/version.c Mon May 26 23:04:21 2003
--- src/version.c Tue May 27 19:30:13 2003
***************
*** 632,633 ****
--- 632,635 ----
{ /* Add new patch number below this line */
+ /**/
+ 7,
/**/
--
I once paid $12 to peer at the box that held King Tutankhamen's little
bandage-covered midget corpse at the De Young Museum in San Francisco. I
remember thinking how pleased he'd be about the way things turned out in his
afterlife.
(Scott Adams - The Dilbert principle)
/// Bram Moolenaar --
[email protected] --
http://www.Moolenaar.net \\\
/// Creator of Vim - Vi IMproved --
http://www.Vim.org \\\
\\\ Project leader for A-A-P --
http://www.A-A-P.org ///
\\\ Help AIDS victims, buy at Amazon --
http://ICCF.nl/click1.html ///
