From f33889c73ee8395bc2d2759ce47983307b020ffc Mon Sep 17 00:00:00 2001
From: "mkaply%us.ibm.com"
 <mkaply%us.ibm.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 5 Apr 2000 02:36:47 +0000
Subject: [PATCH] # 34082 r= pnunn@netscape.com OS/2 Visual Age build - Adding
 PR_CALLBACK to some functoins for linkage

git-svn-id: svn://10.0.0.236/trunk@65298 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/modules/libimg/pngcom/ipng.cpp | 21 +++++++++++++++++----
 mozilla/modules/libimg/src/color.cpp   | 17 +++++++++++++++--
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/mozilla/modules/libimg/pngcom/ipng.cpp b/mozilla/modules/libimg/pngcom/ipng.cpp
index f94a17a8556..905ede1407e 100644
--- a/mozilla/modules/libimg/pngcom/ipng.cpp
+++ b/mozilla/modules/libimg/pngcom/ipng.cpp
@@ -18,6 +18,19 @@
  * Rights Reserved.
  *
  * Contributor(s): 
+ *
+ *
+ * This Original Code has been modified by IBM Corporation.
+ * Modifications made by IBM described herein are
+ * Copyright (c) International Business Machines
+ * Corporation, 2000
+ *
+ * Modifications to Mozilla code or documentation
+ * identified per MPL Section 3.3
+ *
+ * Date         Modified by     Description of modification
+ * 03/27/2000   IBM Corp.       Added PR_CALLBACK for Optlink
+ *                               use in OS2
  */
 
 #include "png.h"
@@ -33,11 +46,11 @@
 
 #define MINIMUM_DELAY_TIME 10
 
-static void info_callback(png_structp png_ptr, png_infop info);
-static void row_callback(png_structp png_ptr, png_bytep new_row,
+static void PR_CALLBACK info_callback(png_structp png_ptr, png_infop info);
+static void PR_CALLBACK row_callback(png_structp png_ptr, png_bytep new_row,
                          png_uint_32 row_num, int pass);
-static void end_callback(png_structp png_ptr, png_infop info);
-static void il_png_error_handler(png_structp png_ptr, png_const_charp msg);
+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;
diff --git a/mozilla/modules/libimg/src/color.cpp b/mozilla/modules/libimg/src/color.cpp
index 95bde20dfe3..634f41c9292 100644
--- a/mozilla/modules/libimg/src/color.cpp
+++ b/mozilla/modules/libimg/src/color.cpp
@@ -18,6 +18,19 @@
  * Rights Reserved.
  *
  * Contributor(s): 
+ *
+ *
+ * This Original Code has been modified by IBM Corporation.
+ * Modifications made by IBM described herein are
+ * Copyright (c) International Business Machines
+ * Corporation, 2000
+ *
+ * Modifications to Mozilla code or documentation
+ * identified per MPL Section 3.3
+ *
+ * Date         Modified by     Description of modification
+ * 03/27/2000   IBM Corp.       Added PR_CALLBACK for Optlink
+ *                               use in OS2
  */
 
 /* -*- Mode: C; tab-width: 4 -*-
@@ -25,7 +38,7 @@
                Includes dithering for B&W displays, but not dithering
                for PseudoColor displays which can be found in dither.c.
                
-   $Id: color.cpp,v 3.14 1999-11-13 22:37:39 cls%seawood.org Exp $
+   $Id: color.cpp,v 3.15 2000-04-05 02:36:47 mkaply%us.ibm.com Exp $
 */
 
 
@@ -585,7 +598,7 @@ ConvertRGBToRGB32(il_container *ic,
 }
 
 /* Sorting predicate for NS_QuickSort() */
-int compare_PRUint32(const void *a, const void *b, void *unused)
+int PR_CALLBACK compare_PRUint32(const void *a, const void *b, void *unused)
 {
     PRUint32 a1 = *(PRUint32*)a;
     PRUint32 b1 = *(PRUint32*)b;