Fixed 50782. Multiply defined symbols cause Tru64 5.0 to crash.

Found and fixed by harbaugh.  Fix improved by tor, r=pnunn, a=brendan


git-svn-id: svn://10.0.0.236/trunk@79871 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jim_nance%yahoo.com 2000-09-22 09:18:40 +00:00
parent fa0975f86b
commit ff4e76f2a7
3 changed files with 1 additions and 10 deletions

View File

@ -77,9 +77,6 @@ mailing address.
#define HOWMANY(x, r) (((x) + ((r) - 1)) / (r))
#define ROUNDUP(x, r) (HOWMANY(x, r) * (r))
int il_debug;
PRLogModuleInfo *il_log_module = NULL;
#ifndef MAX
# define MAX(x, y) (((x) > (y)) ? (x) : (y))
#endif

View File

@ -22,7 +22,7 @@
/*
* jpeg.c --- Glue code to Independent JPEG Group decoder library
* $Id: jpeg.cpp,v 1.18 2000-08-07 22:08:29 pnunn%netscape.com Exp $
* $Id: jpeg.cpp,v 1.19 2000-09-22 09:18:38 jim_nance%yahoo.com Exp $
*/
@ -64,9 +64,6 @@ PR_END_EXTERN_C
/* Normal JFIF markers can't have more bytes than this. */
#define MAX_JPEG_MARKER_LENGTH (((PRUint32)1 << 16) - 1)
int il_debug;
PRLogModuleInfo *il_log_module = NULL;
/*
* States that the jpeg decoder might be in
*/

View File

@ -51,9 +51,6 @@ 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);
int il_debug;
PRLogModuleInfo *il_log_module = NULL;
#define CAN_SUPPORT_8_BIT_MASK
PRBool