diff --git a/include/ChangeLog b/include/ChangeLog
index 41103a4c8f9..1655306019c 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-01  Steve Ellcey  <sellcey@mips.com>
+
+	* include/longlong.h: Use 'defined()' to check __mips16.
+
 2014-04-30  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* longlong.h (__i386__): Remove W_TYPE_SIZE==64 handling.
diff --git a/include/longlong.h b/include/longlong.h
index 0770290a58b..31f88cb3f59 100644
--- a/include/longlong.h
+++ b/include/longlong.h
@@ -848,7 +848,7 @@ extern UDItype __umulsidi3 (USItype, USItype);
 #define UMUL_TIME 10
 #define UDIV_TIME 100
 
-#if (__mips == 32 || __mips == 64) && ! __mips16
+#if (__mips == 32 || __mips == 64) && ! defined (__mips16)
 #define count_leading_zeros(COUNT,X)	((COUNT) = __builtin_clz (X))
 #define COUNT_LEADING_ZEROS_0 32
 #endif