Backing out jim_nance's checkins, breaks win32 build, also has #ifdef

XP_MAC which is crufty, should be able to do this xp

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

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