SOURCES: 7.1.279 (NEW), 7.1.280 (NEW), 7.1.281 (NEW), 7.1.282 (NEW...

adamg adamg at pld-linux.org
Sat Mar 22 12:19:59 CET 2008


Author: adamg                        Date: Sat Mar 22 11:19:59 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- new

---- Files affected:
SOURCES:
   7.1.279 (NONE -> 1.1)  (NEW), 7.1.280 (NONE -> 1.1)  (NEW), 7.1.281 (NONE -> 1.1)  (NEW), 7.1.282 (NONE -> 1.1)  (NEW), 7.1.283 (NONE -> 1.1)  (NEW), 7.1.284 (NONE -> 1.1)  (NEW), 7.1.285 (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/7.1.279
diff -u /dev/null SOURCES/7.1.279:1.1
--- /dev/null	Sat Mar 22 12:19:59 2008
+++ SOURCES/7.1.279	Sat Mar 22 12:19:54 2008
@@ -0,0 +1,146 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.279
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.279
+Problem:    When using cscope temporary files are left behind.
+Solution:   Send the quit command to cscope and give it two seconds to exit
+	    nicely before killing it. (partly by Dominique Pelle)
+Files:	    src/if_cscope.c
+
+
+*** ../vim-7.1.278/src/if_cscope.c	Fri Sep 14 19:56:18 2007
+--- src/if_cscope.c	Sat Mar 15 12:38:12 2008
+***************
+*** 2096,2101 ****
+--- 2096,2113 ----
+      return CSCOPE_SUCCESS;
+  }
+  
++ #if defined(UNIX) && defined(SIGALRM)
++ /*
++  * Used to catch and ignore SIGALRM below.
++  */
++ /* ARGSUSED */
++     static RETSIGTYPE
++ sig_handler SIGDEFARG(sigarg)
++ {
++     /* do nothing */
++     SIGRETURN;
++ }
++ #endif
+  
+  /*
+   * PRIVATE: cs_release_csp
+***************
+*** 2108,2116 ****
+      int i;
+      int freefnpp;
+  {
+- #if defined(UNIX)
+-     int pstat;
+- #else
+      /*
+       * Trying to exit normally (not sure whether it is fit to UNIX cscope
+       */
+--- 2120,2125 ----
+***************
+*** 2119,2124 ****
+--- 2128,2179 ----
+  	(void)fputs("q\n", csinfo[i].to_fp);
+  	(void)fflush(csinfo[i].to_fp);
+      }
++ #if defined(UNIX)
++     {
++ 	int pstat;
++ 	pid_t pid;
++ 
++ # if defined(HAVE_SIGACTION)
++ 	struct sigaction sa, old;
++ 
++         /* Use sigaction() to limit the waiting time to two seconds. */
++ 	sa.sa_handler = sig_handler;
++ 	sa.sa_flags = SA_NODEFER;
++ 	sigaction(SIGALRM, &sa, &old);
++ 	alarm(2); /* 2 sec timeout */
++ 
++ 	/* Block until cscope exits or until timer expires */
++ 	pid = waitpid(csinfo[i].pid, &pstat, 0);
++ 
++ 	/* cancel pending alarm if still there and restore signal */
++ 	alarm(0);
++ 	sigaction(SIGALRM, &old, NULL);
++ # else
++ 	int waited;
++ 
++ 	/* Can't use sigaction(), loop for two seconds.  First yield the CPU
++ 	 * to give cscope a chance to exit quickly. */
++ 	sleep(0);
++ 	for (waited = 0; waited < 40; ++waited)
++ 	{
++ 	    pid = waitpid(csinfo[i].pid, &pstat, WNOHANG);
++ 	    if (pid != 0)
++ 		break;  /* break unless the process is still running */
++ 	    mch_delay(50, FALSE); /* sleep 50 ms */
++ 	}
++ # endif
++ 	/*
++ 	 * If the cscope process is still running: kill it.
++ 	 * Safety check: If the PID would be zero here, the entire X session
++ 	 * would be killed.  -1 and 1 are dangerous as well.
++ 	 */
++ 	if (pid < 0 && csinfo[i].pid > 1)
++ 	{
++ 	    kill(csinfo[i].pid, SIGTERM);
++ 	    (void)waitpid(csinfo[i].pid, &pstat, 0);
++ 	}
++     }
++ #else  /* !UNIX */
+      if (csinfo[i].hProc != NULL)
+      {
+  	/* Give cscope a chance to exit normally */
+***************
+*** 2133,2150 ****
+      if (csinfo[i].to_fp != NULL)
+  	(void)fclose(csinfo[i].to_fp);
+  
+-     /*
+-      * Safety check: If the PID would be zero here, the entire X session would
+-      * be killed.  -1 and 1 are dangerous as well.
+-      */
+- #if defined(UNIX)
+-     if (csinfo[i].pid > 1)
+-     {
+- 	kill(csinfo[i].pid, SIGTERM);
+- 	(void)waitpid(csinfo[i].pid, &pstat, 0);
+-     }
+- #endif
+- 
+      if (freefnpp)
+      {
+  	vim_free(csinfo[i].fname);
+--- 2188,2193 ----
+*** ../vim-7.1.278/src/version.c	Wed Mar 12 21:47:31 2008
+--- src/version.c	Sat Mar 15 12:38:58 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     279,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+130. You can't get out of your desk even if it's time to eat or time
+     to go to the bathroom.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

================================================================
Index: SOURCES/7.1.280
diff -u /dev/null SOURCES/7.1.280:1.1
--- /dev/null	Sat Mar 22 12:19:59 2008
+++ SOURCES/7.1.280	Sat Mar 22 12:19:54 2008
@@ -0,0 +1,52 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.280
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.280  (after 7.1.275)
+Problem:    Mac: build problems when not using multibyte feature. (Nicholas
+	    Stallard)
+Solution:   Don't define USE_IM_CONTROL when not using multibyte.
+Files:	    src/vim.h
+
+
+*** ../vim-7.1.279/src/vim.h	Wed Mar 12 17:25:50 2008
+--- src/vim.h	Thu Mar 13 23:39:21 2008
+***************
+*** 463,469 ****
+   */
+  #if defined(FEAT_XIM) \
+      || (defined(FEAT_GUI) && (defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \
+!     || defined(FEAT_GUI_MAC)
+  # define USE_IM_CONTROL
+  #endif
+  
+--- 466,472 ----
+   */
+  #if defined(FEAT_XIM) \
+      || (defined(FEAT_GUI) && (defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \
+!     || (defined(FEAT_GUI_MAC) && defined(FEAT_MBYTE))
+  # define USE_IM_CONTROL
+  #endif
+  
+*** ../vim-7.1.279/src/version.c	Sat Mar 15 12:40:23 2008
+--- src/version.c	Sat Mar 15 13:08:40 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     280,
+  /**/
+
+-- 
+Why is it called "Windows"?  "Gates" would be more appropriate...
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

================================================================
Index: SOURCES/7.1.281
diff -u /dev/null SOURCES/7.1.281:1.1
--- /dev/null	Sat Mar 22 12:19:59 2008
+++ SOURCES/7.1.281	Sat Mar 22 12:19:54 2008
@@ -0,0 +1,72 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.281
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.281 (after 7.1.279)
+Problem:    sa.sa_mask is not initialized.  Cscope may not exit.
+Solution:   Use sigemptyset().  Use SIGKILL instead of SIGTERM. (Dominique
+	    Pelle)
+Files:	    src/if_cscope.c
+
+
+*** ../vim-7.1.280/src/if_cscope.c	Sat Mar 15 12:40:23 2008
+--- src/if_cscope.c	Sun Mar 16 13:05:51 2008
+***************
+*** 2136,2142 ****
+  # if defined(HAVE_SIGACTION)
+  	struct sigaction sa, old;
+  
+!         /* Use sigaction() to limit the waiting time to two seconds. */
+  	sa.sa_handler = sig_handler;
+  	sa.sa_flags = SA_NODEFER;
+  	sigaction(SIGALRM, &sa, &old);
+--- 2136,2143 ----
+  # if defined(HAVE_SIGACTION)
+  	struct sigaction sa, old;
+  
+! 	/* Use sigaction() to limit the waiting time to two seconds. */
+! 	sigemptyset(&sa.sa_mask);
+  	sa.sa_handler = sig_handler;
+  	sa.sa_flags = SA_NODEFER;
+  	sigaction(SIGALRM, &sa, &old);
+***************
+*** 2169,2175 ****
+  	 */
+  	if (pid < 0 && csinfo[i].pid > 1)
+  	{
+! 	    kill(csinfo[i].pid, SIGTERM);
+  	    (void)waitpid(csinfo[i].pid, &pstat, 0);
+  	}
+      }
+--- 2170,2176 ----
+  	 */
+  	if (pid < 0 && csinfo[i].pid > 1)
+  	{
+! 	    kill(csinfo[i].pid, SIGKILL);
+  	    (void)waitpid(csinfo[i].pid, &pstat, 0);
+  	}
+      }
+*** ../vim-7.1.280/src/version.c	Sat Mar 15 13:10:57 2008
+--- src/version.c	Sun Mar 16 13:08:08 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     281,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+136. You decide to stay in a low-paying job teaching just for the
+     free Internet access.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

================================================================
Index: SOURCES/7.1.282
diff -u /dev/null SOURCES/7.1.282:1.1
--- /dev/null	Sat Mar 22 12:19:59 2008
+++ SOURCES/7.1.282	Sat Mar 22 12:19:54 2008
@@ -0,0 +1,549 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.282 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.282 (extra)
+Problem:    Win64: Edit with Vim context menu isn't installed correctly.
+	    Compiler warnings and a few other things.
+Solution:   Add [ and ] to entry of class name.  Use UINT_PTR instead of UINT.
+	    And a fixes for the other things. (George V.  Reilly)
+Files:	    src/GvimExt/Makefile, src/dosinst.c, src/if_ole.cpp, src/if_ole.h,
+	    src/if_ole.idl, src/INSTALLpc.txt,  src/Make_mvc.mak,
+	    src/os_win32.c,
+
+
+*** ../vim-7.1.281/src/GvimExt/Makefile	Sat May  5 12:51:46 2007
+--- src/GvimExt/Makefile	Tue Jul 10 16:18:18 2007
+***************
+*** 24,30 ****
+  gvimext.obj: gvimext.h
+  
+  .cpp.obj:
+!     $(cc) $(cflags) -DFEAT_GETTEXT $(cvarsdll) $*.cpp
+  
+  gvimext.res: gvimext.rc
+      $(rc) $(rcflags) $(rcvars)  gvimext.rc
+--- 24,30 ----
+  gvimext.obj: gvimext.h
+  
+  .cpp.obj:
+!     $(cc) $(cflags) -DFEAT_GETTEXT $(cvarsmt) $*.cpp
+  
+  gvimext.res: gvimext.rc
+      $(rc) $(rcflags) $(rcvars)  gvimext.rc
+*** ../vim-7.1.281/src/dosinst.c	Thu May 10 20:54:39 2007
+--- src/dosinst.c	Tue Jul 10 16:07:16 2007
+***************
+*** 1365,1371 ****
+  
+  	    printf("Creating \"Edit with Vim\" popup menu entry\n");
+  
+! 	    fprintf(fd, "HKEY_CLASSES_ROOT\\CLSID\\%s\n", vim_ext_clsid);
+  	    fprintf(fd, "@=\"%s\"\n", vim_ext_name);
+  	    fprintf(fd, "[HKEY_CLASSES_ROOT\\CLSID\\%s\\InProcServer32]\n",
+  							       vim_ext_clsid);
+--- 1365,1371 ----
+  
+  	    printf("Creating \"Edit with Vim\" popup menu entry\n");
+  
+! 	    fprintf(fd, "[HKEY_CLASSES_ROOT\\CLSID\\%s]\n", vim_ext_clsid);
+  	    fprintf(fd, "@=\"%s\"\n", vim_ext_name);
+  	    fprintf(fd, "[HKEY_CLASSES_ROOT\\CLSID\\%s\\InProcServer32]\n",
+  							       vim_ext_clsid);
+*** ../vim-7.1.281/src/if_ole.cpp	Wed Aug 16 17:34:09 2006
+--- src/if_ole.cpp	Tue Sep 25 16:44:44 2007
+***************
+*** 34,39 ****
+--- 34,45 ----
+  extern HWND vim_parent_hwnd;
+  }
+  
++ #if _MSC_VER < 1300
++ /* Work around old versions of basetsd.h which wrongly declares
++  * UINT_PTR as unsigned long */
++ # define UINT_PTR UINT
++ #endif
++ 
+  #include "if_ole.h"	// Interface definitions
+  #include "iid_ole.c"	// UUID definitions (compile here)
+  
+***************
+*** 107,113 ****
+      STDMETHOD(SendKeys)(BSTR keys);
+      STDMETHOD(Eval)(BSTR expr, BSTR *result);
+      STDMETHOD(SetForeground)(void);
+!     STDMETHOD(GetHwnd)(UINT *result);
+  
+  private:
+      // Constructor is private - create using CVim::Create()
+--- 113,119 ----
+      STDMETHOD(SendKeys)(BSTR keys);
+      STDMETHOD(Eval)(BSTR expr, BSTR *result);
+      STDMETHOD(SetForeground)(void);
+!     STDMETHOD(GetHwnd)(UINT_PTR *result);
+  
+  private:
+      // Constructor is private - create using CVim::Create()
+***************
+*** 288,296 ****
+  }
+  
+  STDMETHODIMP
+! CVim::GetHwnd(UINT *result)
+  {
+!     *result = (UINT) s_hwnd;
+      return S_OK;
+  }
+  
+--- 294,302 ----
+  }
+  
+  STDMETHODIMP
+! CVim::GetHwnd(UINT_PTR *result)
+  {
+!     *result = (UINT_PTR)s_hwnd;
+      return S_OK;
+  }
+  
+*** ../vim-7.1.281/src/if_ole.h	Sun Jun 13 17:46:29 2004
+--- src/if_ole.h	Tue Jul 10 16:21:18 2007
+***************
+*** 79,85 ****
+  	virtual HRESULT STDMETHODCALLTYPE SetForeground( void) = 0;
+  
+  	virtual HRESULT STDMETHODCALLTYPE GetHwnd(
+! 	    /* [retval][out] */ UINT __RPC_FAR *result) = 0;
+  
+      };
+  
+--- 79,85 ----
+  	virtual HRESULT STDMETHODCALLTYPE SetForeground( void) = 0;
+  
+  	virtual HRESULT STDMETHODCALLTYPE GetHwnd(
+! 	    /* [retval][out] */ UINT_PTR __RPC_FAR *result) = 0;
+  
+      };
+  
+***************
+*** 143,149 ****
+  
+  	HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetHwnd )(
+  	    IVim __RPC_FAR * This,
+! 	    /* [retval][out] */ UINT __RPC_FAR *result);
+  
+  	END_INTERFACE
+      } IVimVtbl;
+--- 143,149 ----
+  
+  	HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetHwnd )(
+  	    IVim __RPC_FAR * This,
+! 	    /* [retval][out] */ UINT_PTR __RPC_FAR *result);
+  
+  	END_INTERFACE
+      } IVimVtbl;
+***************
+*** 236,242 ****
+  
+  HRESULT STDMETHODCALLTYPE IVim_GetHwnd_Proxy(
+      IVim __RPC_FAR * This,
+!     /* [retval][out] */ UINT __RPC_FAR *result);
+  
+  
+  void __RPC_STUB IVim_GetHwnd_Stub(
+--- 236,242 ----
+  
+  HRESULT STDMETHODCALLTYPE IVim_GetHwnd_Proxy(
+      IVim __RPC_FAR * This,
+!     /* [retval][out] */ UINT_PTR __RPC_FAR *result);
+  
+  
+  void __RPC_STUB IVim_GetHwnd_Stub(
+*** ../vim-7.1.281/src/if_ole.idl	Sun Jun 13 17:22:03 2004
+--- src/if_ole.idl	Tue Jul 10 16:21:45 2007
+***************
+*** 20,26 ****
+  	HRESULT SendKeys([in]BSTR keys);
+  	HRESULT Eval([in]BSTR expr, [out, retval]BSTR* result);
+  	HRESULT SetForeground(void);
+! 	HRESULT GetHwnd([out, retval]UINT* result);
+  };
+  
+  // Component and type library definitions
+--- 20,26 ----
+  	HRESULT SendKeys([in]BSTR keys);
+  	HRESULT Eval([in]BSTR expr, [out, retval]BSTR* result);
+  	HRESULT SetForeground(void);
+! 	HRESULT GetHwnd([out, retval]UINT_PTR* result);
+  };
+  
+  // Component and type library definitions
+*** ../vim-7.1.281/src/INSTALLpc.txt	Sun Apr 30 20:29:26 2006
+--- src/INSTALLpc.txt	Wed Mar 12 15:01:37 2008
+***************
+*** 82,90 ****
+  |ms-platform-sdk|, |dotnet-1.1-redist|, |dotnet-1.1-sdk|,
+  and |windbg-download|.
+  
+! It's easier to download Visual C++ 2005 Express Edition, |msvc-2005-express|.
+! The advantage of the VC 2003 Toolkit is that it will be freely available
+! long after VC 2005 Express Edition stops being free in November 2006.
+  
+  The free Code::Blocks IDE works with the VC2003 Toolkit, as described at
+      http://wiki.codeblocks.org/index.php?title=Integrating_Microsoft_Visual_Toolkit_2003_with_Code::Blocks_IDE
+--- 82,89 ----
+  |ms-platform-sdk|, |dotnet-1.1-redist|, |dotnet-1.1-sdk|,
+  and |windbg-download|.
+  
+! It's easier to download Visual C++ 2008 Express Edition, |msvc-2008-express|,
+! which is freely available in perpetuity.
+  
+  The free Code::Blocks IDE works with the VC2003 Toolkit, as described at
+      http://wiki.codeblocks.org/index.php?title=Integrating_Microsoft_Visual_Toolkit_2003_with_Code::Blocks_IDE
+***************
+*** 152,157 ****
+--- 151,164 ----
+      http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/default.aspx
+  
+  
++ Visual C++ 2008 Express Edition       *msvc-2008-express*
++ -------------------------------
++ 
++ Visual C++ 2008 Express Edition can be downloaded for free from:
++     http://msdn2.microsoft.com/en-us/express/default.aspx
++ This includes the IDE and the debugger. You can build Vim with Make_mvc.mak.
++ 
++ 
+  2. MinGW
+  ========
+  
+*** ../vim-7.1.281/src/Make_mvc.mak	Wed Oct  3 13:28:40 2007
+--- src/Make_mvc.mak	Wed Mar 12 15:09:55 2008
+***************
+*** 1,6 ****
+  # Makefile for Vim on Win32 (Windows NT/2000/XP/2003 and Windows 95/98/Me)
+  # and Win64, using the Microsoft Visual C++ compilers. Known to work with
+! # VC5, VC6 (VS98), VC7.0 (VS2002), VC7.1 (VS2003), and VC8 (VS2005).
+  #
+  # To build using other Windows compilers, see INSTALLpc.txt
+  #
+--- 1,7 ----
+  # Makefile for Vim on Win32 (Windows NT/2000/XP/2003 and Windows 95/98/Me)
+  # and Win64, using the Microsoft Visual C++ compilers. Known to work with
+! # VC5, VC6 (VS98), VC7.0 (VS2002), VC7.1 (VS2003), VC8 (VS2005),
+! # and VC9 (VS2008).
+  #
+  # To build using other Windows compilers, see INSTALLpc.txt
+  #
+***************
+*** 285,291 ****
+  # need shell32.lib for ExtractIcon()
+  # gdi32.lib and comdlg32.lib for printing support
+  # ole32.lib and uuid.lib are needed for FEAT_SHORTCUT
+! CON_LIB = advapi32.lib shell32.lib gdi32.lib comdlg32.lib ole32.lib uuid.lib
+  !if "$(DELAYLOAD)" == "yes"
+  CON_LIB = $(CON_LIB) /DELAYLOAD:comdlg32.dll /DELAYLOAD:ole32.dll DelayImp.lib
+  !endif
+--- 286,293 ----
+  # need shell32.lib for ExtractIcon()
+  # gdi32.lib and comdlg32.lib for printing support
+  # ole32.lib and uuid.lib are needed for FEAT_SHORTCUT
+! CON_LIB = oldnames.lib kernel32.lib advapi32.lib shell32.lib gdi32.lib \
+!           comdlg32.lib ole32.lib uuid.lib /machine:$(CPU) /nodefaultlib
+  !if "$(DELAYLOAD)" == "yes"
+  CON_LIB = $(CON_LIB) /DELAYLOAD:comdlg32.dll /DELAYLOAD:ole32.dll DelayImp.lib
+  !endif
+***************
+*** 331,336 ****
+--- 333,339 ----
+  !endif
+  !if "$(_NMAKE_VER)" == "6.00.8168.0"
+  MSVCVER = 6.0
++ CPU = ix86
+  !endif
+  !if "$(_NMAKE_VER)" == "7.00.9466"
+  MSVCVER = 7.0
+***************
+*** 344,349 ****
+--- 347,355 ----
+  !if "$(_NMAKE_VER)" == "8.00.50727.762"
+  MSVCVER = 8.0
+  !endif
++ !if "$(_NMAKE_VER)" == "9.00.20706.01"
++ MSVCVER = 9.0
++ !endif
+  !endif
+  
+  # Abort bulding VIM if version of VC is unrecognised.
+***************
+*** 352,364 ****
+  !message Cannot determine Visual C version being used.  If you are using the
+  !message Windows SDK then you must have the environment variable MSVCVER set to
+  !message your version of the VC compiler.  If you are not using the Express
+! !message version of Visual C you van either set MSVCVER or update this makefile
+! !message to handle the new value for _NMAKE_VER.
+  !error Make aborted.
+  !endif
+  
+  # Convert processor ID to MVC-compatible number
+! !if "$(MSVCVER)" != "8.0"
+  !if "$(CPUNR)" == "i386"
+  CPUARG = /G3
+  !elseif "$(CPUNR)" == "i486"
+--- 358,370 ----
+  !message Cannot determine Visual C version being used.  If you are using the
+  !message Windows SDK then you must have the environment variable MSVCVER set to
+  !message your version of the VC compiler.  If you are not using the Express
+! !message version of Visual C, you can either set MSVCVER or update this makefile
+! !message to handle the new value for _NMAKE_VER, "$(_NMAKE_VER)".
+  !error Make aborted.
<<Diff was trimmed, longer than 597 lines>>


More information about the pld-cvs-commit mailing list