Merge branch 'bw/maint-1.7.9-solaris-getpass' into maint-1.7.11
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 Aug 2012 19:05:11 +0000 (12:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Aug 2012 19:05:11 +0000 (12:05 -0700)
* bw/maint-1.7.9-solaris-getpass:
  Enable HAVE_DEV_TTY for Solaris
  terminal: seek when switching between reading and writing

1  2 
Makefile

diff --cc Makefile
index df583035e41a3d38eb79f90f73c7d4e6ca87b184,9472ff768cf7e520c1c04da6e3036e22b025cd26..1f72c1c74548ff1622232132d1ff717855f007bc
+++ b/Makefile
@@@ -1004,7 -909,7 +1004,8 @@@ ifeq ($(uname_S),SunOS
        NO_MKSTEMPS = YesPlease
        NO_REGEX = YesPlease
        NO_FNMATCH_CASEFOLD = YesPlease
 +      NO_MSGFMT_EXTENDED_OPTIONS = YesPlease
+       HAVE_DEV_TTY = YesPlease
        ifeq ($(uname_R),5.6)
                SOCKLEN_T = int
                NO_HSTRERROR = YesPlease