Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-25 20:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'Integration_2.2.0'

Browse source
This commit is contained in:
David Adam 2015-07-12 22:50:34 +08:00
commit 7954b95f5d
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
env_universal_common.cpp
View file

@ -698,7 +698,7 @@ bool env_universal_t::open_and_acquire_lock(const wcstring &path, int *out_fd)
*/
int result_fd = -1;
bool needs_lock = true;
int flags = O_RDONLY | O_CREAT;
int flags = O_RDWR | O_CREAT;
#ifdef O_EXLOCK
flags |= O_EXLOCK;
needs_lock = false;
@ -741,8 +741,7 @@ bool env_universal_t::open_and_acquire_lock(const wcstring &path, int *out_fd)
/* error */
if (errno != EINTR)
{
int err = errno;
report_error(err, L"Unable to lock universal variable file '%ls'", path.c_str());
/* Do nothing per #2149 */
break;
}
}

6
fish.xcodeproj/project.pbxproj
View file

@ -1325,7 +1325,7 @@
"SYSCONFDIR=L\\\"/usr/local/etc\\\"",
"BINDIR=L\\\"/usr/local/bin\\\"",
"DOCDIR=L\\\"/usr/local/share/doc\\\"",
"FISH_BUILD_VERSION=\\\"2.2b1-git\\\"",
"FISH_BUILD_VERSION=\\\"2.2.0-git\\\"",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@ -1453,7 +1453,7 @@
"SYSCONFDIR=L\\\"/usr/local/etc\\\"",
"BINDIR=L\\\"/usr/local/bin\\\"",
"DOCDIR=L\\\"/usr/local/share/doc\\\"",
"FISH_BUILD_VERSION=\\\"2.2b1-git\\\"",
"FISH_BUILD_VERSION=\\\"2.2.0-git\\\"",
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@ -1481,7 +1481,7 @@
"SYSCONFDIR=L\\\"/usr/local/etc\\\"",
"BINDIR=L\\\"/usr/local/bin\\\"",
"DOCDIR=L\\\"/usr/local/share/doc\\\"",
"FISH_BUILD_VERSION=\\\"2.2b1-git\\\"",
"FISH_BUILD_VERSION=\\\"2.2.0-git\\\"",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;

4
osx/config.h
View file

@ -222,7 +222,7 @@
#define PACKAGE_NAME "fish"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "fish 2.2b1-git"
#define PACKAGE_STRING "fish 2.2.0-git"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "fish"
@ -231,7 +231,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
#define PACKAGE_VERSION "2.2b1-git"
#define PACKAGE_VERSION "2.2.0-git"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1