include/

[binutils-gdb.git] / gas / as.h

diff --git a/gas/as.h b/gas/as.h
index ba526dc4d812f4a4a4f18420a979dc7c1241c8f2..c670536b9fcc087ddf68da6d6d62b3f20856771e 100644 (file)
--- a/gas/as.h
+++ b/gas/as.h
@@ -106,9 +106,9 @@ typedef int * va_list;
 #undef NDEBUG
 #endif
 #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 6)
-#define __PRETTY_FUNCTION__  ((char*)0)
+#define __PRETTY_FUNCTION__  ((char *) NULL)
 #endif
-#define assert(P) \
+#define gas_assert(P) \
   ((void) ((P) ? 0 : (as_assert (__FILE__, __LINE__, __PRETTY_FUNCTION__), 0)))
 #undef abort
 #define abort()                as_abort (__FILE__, __LINE__, __PRETTY_FUNCTION__)
@@ -149,6 +149,10 @@ extern void *realloc ();
 extern char *strstr ();
 #endif
 
+#if !HAVE_DECL_MEMPCPY
+void *mempcpy(void *, const void *, size_t);
+#endif
+
 #if !HAVE_DECL_VSNPRINTF
 extern int vsnprintf(char *, size_t, const char *, va_list);
 #endif
@@ -235,10 +239,10 @@ typedef addressT valueT;
 
 #if ENABLE_CHECKING || defined (DEBUG)
 #ifndef know
-#define know(p) assert(p)      /* Verify our assumptions!  */
+#define know(p) gas_assert(p)  /* Verify our assumptions!  */
 #endif /* not yet defined */
 #else
-#define know(p)                        /* know() checks are no-op.ed  */
+#define know(p)        do {} while (0) /* know() checks are no-op.ed  */
 #endif
 \f
 /* input_scrub.c */