github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-27 14:45:13 +08:00
Code Issues Actions 2 Packages Projects Releases 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; int result_fd = -1;
bool needs_lock = true; bool needs_lock = true;
int flags = O_RDONLY | O_CREAT; int flags = O_RDWR | O_CREAT;
#ifdef O_EXLOCK #ifdef O_EXLOCK
flags |= O_EXLOCK; flags |= O_EXLOCK;
needs_lock = false; needs_lock = false;
@ -741,8 +741,7 @@ bool env_universal_t::open_and_acquire_lock(const wcstring &path, int *out_fd)
/* error */ /* error */
if (errno != EINTR) if (errno != EINTR)
{ {
int err = errno; /* Do nothing per #2149 */
report_error(err, L"Unable to lock universal variable file '%ls'", path.c_str());
break; break;
} }
} }

6
fish.xcodeproj/project.pbxproj
View File

@ -1325,7 +1325,7 @@
"SYSCONFDIR=L\\\"/usr/local/etc\\\"", "SYSCONFDIR=L\\\"/usr/local/etc\\\"",
"BINDIR=L\\\"/usr/local/bin\\\"", "BINDIR=L\\\"/usr/local/bin\\\"",
"DOCDIR=L\\\"/usr/local/share/doc\\\"", "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_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
@ -1453,7 +1453,7 @@
"SYSCONFDIR=L\\\"/usr/local/etc\\\"", "SYSCONFDIR=L\\\"/usr/local/etc\\\"",
"BINDIR=L\\\"/usr/local/bin\\\"", "BINDIR=L\\\"/usr/local/bin\\\"",
"DOCDIR=L\\\"/usr/local/share/doc\\\"", "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_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@ -1481,7 +1481,7 @@
"SYSCONFDIR=L\\\"/usr/local/etc\\\"", "SYSCONFDIR=L\\\"/usr/local/etc\\\"",
"BINDIR=L\\\"/usr/local/bin\\\"", "BINDIR=L\\\"/usr/local/bin\\\"",
"DOCDIR=L\\\"/usr/local/share/doc\\\"", "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_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;

4
osx/config.h
View File

@ -222,7 +222,7 @@
#define PACKAGE_NAME "fish" #define PACKAGE_NAME "fish"
/* Define to the full name and version of this package. */ /* 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 to the one symbol short name of this package. */
#define PACKAGE_TARNAME "fish" #define PACKAGE_TARNAME "fish"
@ -231,7 +231,7 @@
#define PACKAGE_URL "" #define PACKAGE_URL ""
/* Define to the version of this package. */ /* 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 to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1 #define STDC_HEADERS 1