(PURE_P): New macro (three definitions).

(CHECK_IMPURE): Use PURE_P.

diff --git a/src/puresize.h b/src/puresize.h
index b14543146d1f6fd005549c2388b5861d0b79c95b..7498c9cda939aca3262ed90f37b3778faa9f9ab7 100644 (file)
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -62,31 +62,38 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define PURESIZE  (BASE_PURESIZE * PURESIZE_RATIO)
 #endif
 
-#ifdef VIRT_ADDR_VARIES
+/* Signal an error if OBJ is pure.  */
+#define CHECK_IMPURE(obj) \
+  { if (PURE_P (obj))    \
+      pure_write_error (); }
+\f
+/* Define PURE_P.  */
 
+#ifdef VIRT_ADDR_VARIES
 /* For machines like APOLLO where text and data can go anywhere
    in virtual memory.  */
-#define CHECK_IMPURE(obj) \
-  { extern EMACS_INT pure[]; \
-    if ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) ((char *) pure + PURESIZE) \
-       && (PNTR_COMPARISON_TYPE) XPNTR (obj) >= (PNTR_COMPARISON_TYPE) pure) \
-      pure_write_error (); }
+
+extern EMACS_INT pure[];
+
+#define PURE_P(obj) \
+ ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) ((char *) pure + PURESIZE) \
+  && (PNTR_COMPARISON_TYPE) XPNTR (obj) >= (PNTR_COMPARISON_TYPE) pure)
 
 #else /* not VIRT_ADDR_VARIES */
 #ifdef PNTR_COMPARISON_TYPE
+/* When PNTR_COMPARISON_TYPE is not the default (unsigned int).  */
 
-/* when PNTR_COMPARISON_TYPE is not the default (unsigned int) */
-#define CHECK_IMPURE(obj) \
-  { extern char my_edata[]; \
-    if ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) my_edata) \
-      pure_write_error (); }
+extern char my_edata[];
+
+#define PURE_P(obj) \
+  ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) my_edata)
 
 #else /* not VIRT_ADDRESS_VARIES, not PNTR_COMPARISON_TYPE */
 
-#define CHECK_IMPURE(obj) \
-  { extern char my_edata[]; \
-    if (XPNTR (obj) < (unsigned int) my_edata) \
-      pure_write_error (); }
+extern char my_edata[];
+    
+#define PURE_P(obj) \
+  (XPNTR (obj) < (unsigned int) my_edata)
 
 #endif /* PNTR_COMPARISON_TYPE */
 #endif /* VIRT_ADDRESS_VARIES */