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