2 files changed, 7 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8a521a585b6..04b4cab3ddb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-23  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * conf_post.h: Use unsigned it for bool_bf if GNUSTEP (Bug#16210).
+
 2013-12-23  Glenn Morris  <rgm@gnu.org>
 
         * lread.c (Fload): Mention load-prefer-newer in doc.
diff --git a/src/conf_post.h b/src/conf_post.h
index 5e738e4d6b0..66dd9a36f00 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -34,8 +34,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <stdbool.h>
 
-/* The pre-C99 <stdbool.h> emulation doesn't work for bool bitfields.  */
-#if __STDC_VERSION__ < 199901
+/* The pre-C99 <stdbool.h> emulation doesn't work for bool bitfields.
+   Nor does compiling Objective-C with standard GCC.  */
+#if __STDC_VERSION__ < 199901 || NS_IMPL_GNUSTEP
 typedef unsigned int bool_bf;
 #else
 typedef bool bool_bf;