X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=backend%2Fdvi%2Fmdvi-lib%2Fcommon.h;h=27a7d8f9bb8e2a2515c511aca12dbe90ff504039;hb=ab0edaffd2f1790ec8ac7ac17f90e0a8007b92cd;hp=2da61c815a98cce194789678d7484829f4b7cebc;hpb=d24b16f917ca749e9ffebbec8eca0ee791e1b67a;p=evince.git

diff --git a/backend/dvi/mdvi-lib/common.h b/backend/dvi/mdvi-lib/common.h
index 2da61c81..27a7d8f9 100644
--- a/backend/dvi/mdvi-lib/common.h
+++ b/backend/dvi/mdvi-lib/common.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 #ifndef _MDVI_COMMON_H
 #define _MDVI_COMMON_H 1
@@ -39,7 +39,7 @@
 #  endif
 #endif
 
-#ifdef HAVE_MEMCPY
+#if defined(STDC_HEADERS) || defined(HAVE_MEMCPY)
 #define memzero(a,n) memset((a), 0, (n))
 #else
 #define memzero(a,n) bzero((a), (n))
@@ -136,11 +136,11 @@ extern char	*read_alloc_bcpl __PROTO((FILE *, size_t, size_t *));
 
 /* miscellaneous */
 
-extern void message __PROTO((const char *, ...));
-extern void crash __PROTO((const char *, ...));
-extern void fatal __PROTO((const char *, ...));
-extern void error __PROTO((const char *, ...));
-extern void warning __PROTO((const char *, ...));
+extern void mdvi_message __PROTO((const char *, ...));
+extern void mdvi_crash __PROTO((const char *, ...));
+extern void mdvi_fatal __PROTO((const char *, ...));
+extern void mdvi_error __PROTO((const char *, ...));
+extern void mdvi_warning __PROTO((const char *, ...));
 extern int  unit2pix __PROTO((int, const char *));
 extern double unit2pix_factor __PROTO((const char *));
 
@@ -182,12 +182,12 @@ extern Uint32 _mdvi_debug_mask;
 extern void __debug __PROTO((int, const char *, ...));
 #define DEBUG(x)	__debug x
 #define ASSERT(x) do { \
-	if(!(x)) crash("%s:%d: Assertion %s failed\n", \
+	if(!(x)) mdvi_crash("%s:%d: Assertion %s failed\n", \
 		__FILE__, __LINE__, #x); \
 	} while(0)
 #define ASSERT_VALUE(x,y) do { \
 	if((x) != (y)) \
-		crash("%s:%d: Assertion failed (%d = %s != %s)\n", \
+		mdvi_crash("%s:%d: Assertion failed (%d = %s != %s)\n", \
 		__FILE__, __LINE__, (x), #x, #x); \
 	} while(0)
 #else