From 7828f2303a87594092ec1a7b5407c363b49108d3 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Fri, 20 May 2016 22:44:47 +0000
Subject: osx/config.h: update to match current configure output

---
 osx/config.h | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'osx')

diff --git a/osx/config.h b/osx/config.h
index a2b4e7a6..b5d86e05 100644
--- a/osx/config.h
+++ b/osx/config.h
@@ -248,17 +248,49 @@
 /* Perform string translations with gettext */
 /* #undef USE_GETTEXT */
 
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+
+
 /* The size of wchar_t in bits. */
 #define WCHAR_T_BITS 32
 
+/* Define to 1 if on MINIX. */
+/* #undef _MINIX */
+
 /* Macro to enable additional prototypes under BSD */
 /* #undef _NETBSD_SOURCE */
 
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+/* #undef _POSIX_1_SOURCE */
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+/* #undef _POSIX_SOURCE */
+
 /* Macro to enable additional prototypes under BSD */
 /* #undef __BSD_VISIBLE */
 
 /* Macro to enable additional prototypes under Solaris */
-/* #undef __EXTENSIONS__ */
+#define __EXTENSIONS__ 1
 
 #if __GNUC__ >= 3
 #ifndef __warn_unused
-- 
cgit v1.2.3


From 216a45edee502c081dccfd8be85d27ab125fe829 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Fri, 20 May 2016 22:48:00 +0000
Subject: Bump version for VERSION

---
 osx/Info.plist | 2 +-
 osx/config.h   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'osx')

diff --git a/osx/Info.plist b/osx/Info.plist
index d977fe4d..c07543b4 100644
--- a/osx/Info.plist
+++ b/osx/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.991</string>
+	<string>2.3.0</string>
 	<key>CFBundleVersion</key>
 	<string>0.1</string>
 	<key>LSApplicationCategoryType</key>
diff --git a/osx/config.h b/osx/config.h
index b5d86e05..19ce8b77 100644
--- a/osx/config.h
+++ b/osx/config.h
@@ -222,7 +222,7 @@
 #define PACKAGE_NAME "fish"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "fish 2.3b2"
+#define PACKAGE_STRING "fish 2.3.0"
 
 /* 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.3b2"
+#define PACKAGE_VERSION "2.3.0"
 
 /* The size of `wchar_t', as computed by sizeof. */
 #define SIZEOF_WCHAR_T 4
-- 
cgit v1.2.3