From a8d7dae7e846771aaa32f2da5ca8f9fbb1f4e590 Mon Sep 17 00:00:00 2001 From: "pchen%netscape.com" Date: Wed, 27 Sep 2000 22:21:05 +0000 Subject: [PATCH] Backing out jim_nance's checkins, breaks win32 build, also has #ifdef XP_MAC which is crufty, should be able to do this xp git-svn-id: svn://10.0.0.236/trunk@80021 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/libimg/jpgcom/jpeg.cpp | 4 +--- mozilla/modules/libimg/pngcom/ipng.cpp | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/mozilla/modules/libimg/jpgcom/jpeg.cpp b/mozilla/modules/libimg/jpgcom/jpeg.cpp index 707e5c22f6a..d9db3246a16 100644 --- a/mozilla/modules/libimg/jpgcom/jpeg.cpp +++ b/mozilla/modules/libimg/jpgcom/jpeg.cpp @@ -22,7 +22,7 @@ /* * jpeg.c --- Glue code to Independent JPEG Group decoder library - * $Id: jpeg.cpp,v 1.21 2000-09-27 11:48:52 jim_nance%yahoo.com Exp $ + * $Id: jpeg.cpp,v 1.22 2000-09-27 22:18:33 pchen%netscape.com Exp $ */ @@ -64,10 +64,8 @@ PR_END_EXTERN_C /* Normal JFIF markers can't have more bytes than this. */ #define MAX_JPEG_MARKER_LENGTH (((PRUint32)1 << 16) - 1) -#if defined(XP_MAC) /* Mac needs this, but it breaks Tru64 Unix - bug 50782 */ int il_debug; PRLogModuleInfo *il_log_module = NULL; -#endif /* * States that the jpeg decoder might be in diff --git a/mozilla/modules/libimg/pngcom/ipng.cpp b/mozilla/modules/libimg/pngcom/ipng.cpp index be536a501cd..834155ce3d0 100644 --- a/mozilla/modules/libimg/pngcom/ipng.cpp +++ b/mozilla/modules/libimg/pngcom/ipng.cpp @@ -51,10 +51,8 @@ static void PR_CALLBACK row_callback(png_structp png_ptr, png_bytep new_row, static void PR_CALLBACK end_callback(png_structp png_ptr, png_infop info); static void PR_CALLBACK il_png_error_handler(png_structp png_ptr, png_const_charp msg); -#if defined(XP_MAC) /* Mac needs this, but it breaks Tru64 Unix - bug 50782 */ int il_debug; PRLogModuleInfo *il_log_module = NULL; -#endif #define CAN_SUPPORT_8_BIT_MASK