3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.030
3ef2ca
Fcc: outbox
3ef2ca
From: Bram Moolenaar <Bram@moolenaar.net>
3ef2ca
Mime-Version: 1.0
3ef2ca
Content-Type: text/plain; charset=UTF-8
3ef2ca
Content-Transfer-Encoding: 8bit
3ef2ca
------------
3ef2ca
3ef2ca
Patch 7.4.030
3ef2ca
Problem:    The -mno-cygwin argument is no longer supported by Cygwin.
3ef2ca
Solution:   Remove the arguments. (Steve Hall)
3ef2ca
Files:	    src/GvimExt/Make_cyg.mak, src/Make_cyg.mak, src/xxd/Make_cyg.mak
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.029/src/GvimExt/Make_cyg.mak	2011-09-30 16:45:49.000000000 +0200
3ef2ca
--- src/GvimExt/Make_cyg.mak	2013-09-19 20:46:46.000000000 +0200
3ef2ca
***************
3ef2ca
*** 31,42 ****
3ef2ca
  ifeq ($(CROSS),yes)
3ef2ca
  DEL = rm
3ef2ca
  ifeq ($(MINGWOLD),yes)
3ef2ca
! CXXFLAGS := -O2 -mno-cygwin -fvtable-thunks
3ef2ca
  else
3ef2ca
! CXXFLAGS := -O2 -mno-cygwin
3ef2ca
  endif
3ef2ca
  else
3ef2ca
! CXXFLAGS := -O2 -mno-cygwin
3ef2ca
  ifneq (sh.exe, $(SHELL))
3ef2ca
  DEL = rm
3ef2ca
  else
3ef2ca
--- 31,42 ----
3ef2ca
  ifeq ($(CROSS),yes)
3ef2ca
  DEL = rm
3ef2ca
  ifeq ($(MINGWOLD),yes)
3ef2ca
! CXXFLAGS := -O2 -fvtable-thunks
3ef2ca
  else
3ef2ca
! CXXFLAGS := -O2
3ef2ca
  endif
3ef2ca
  else
3ef2ca
! CXXFLAGS := -O2
3ef2ca
  ifneq (sh.exe, $(SHELL))
3ef2ca
  DEL = rm
3ef2ca
  else
3ef2ca
*** ../vim-7.4.029/src/Make_cyg.mak	2013-07-06 13:32:11.000000000 +0200
3ef2ca
--- src/Make_cyg.mak	2013-09-19 20:46:55.000000000 +0200
3ef2ca
***************
3ef2ca
*** 1,6 ****
3ef2ca
  #
3ef2ca
  # Makefile for VIM on Win32, using Cygnus gcc
3ef2ca
! # Last updated by Dan Sharp.  Last Change: 2013 Apr 22
3ef2ca
  #
3ef2ca
  # Also read INSTALLpc.txt!
3ef2ca
  #
3ef2ca
--- 1,6 ----
3ef2ca
  #
3ef2ca
  # Makefile for VIM on Win32, using Cygnus gcc
3ef2ca
! # Last updated by Dan Sharp.  Last Change: 2013 Sep 19
3ef2ca
  #
3ef2ca
  # Also read INSTALLpc.txt!
3ef2ca
  #
3ef2ca
***************
3ef2ca
*** 439,446 ****
3ef2ca
  ##############################
3ef2ca
  ifeq (yes, $(USEDLL))
3ef2ca
  DEFINES += -D_MAX_PATH=256 -D__CYGWIN__
3ef2ca
- else
3ef2ca
- INCLUDES += -mno-cygwin
3ef2ca
  endif
3ef2ca
  
3ef2ca
  ##############################
3ef2ca
--- 439,444 ----
3ef2ca
*** ../vim-7.4.029/src/xxd/Make_cyg.mak	2010-05-15 13:04:06.000000000 +0200
3ef2ca
--- src/xxd/Make_cyg.mak	2013-09-19 20:47:05.000000000 +0200
3ef2ca
***************
3ef2ca
*** 8,14 ****
3ef2ca
  DEFINES =
3ef2ca
  LIBS    = -lc
3ef2ca
  else
3ef2ca
! DEFINES = -mno-cygwin
3ef2ca
  LIBS    =
3ef2ca
  endif
3ef2ca
  
3ef2ca
--- 8,14 ----
3ef2ca
  DEFINES =
3ef2ca
  LIBS    = -lc
3ef2ca
  else
3ef2ca
! DEFINES =
3ef2ca
  LIBS    =
3ef2ca
  endif
3ef2ca
  
3ef2ca
*** ../vim-7.4.029/src/version.c	2013-09-19 17:03:57.000000000 +0200
3ef2ca
--- src/version.c	2013-09-19 20:46:32.000000000 +0200
3ef2ca
***************
3ef2ca
*** 740,741 ****
3ef2ca
--- 740,743 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     30,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
hundred-and-one symptoms of being an internet addict:
3ef2ca
237. You tattoo your email address on your forehead.
3ef2ca
3ef2ca
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
3ef2ca
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
3ef2ca
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
3ef2ca
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///