From 84f4d670c6189cbab7f1b3c5691b0a2a6f4d962c Mon Sep 17 00:00:00 2001
From: Frank Warmerdam <[EMAIL REDACTED]>
Date: Wed, 28 Mar 2007 21:48:16 +0000
Subject: [PATCH] fix static/inline issue with IRIC C++ Compiler
---
ChangeLog | 4 ++--
libtiff/tif_fax3.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 717ad313..4ed5d73c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
-2007-03-17 Joris Van Damme <joris.at.lebbeke@skynet.be>
+2007-03-28 Frank Warmerdam <warmerdam@pobox.com>
- * start of BigTIFF upgrade - CVS HEAD unstable until further notice
+ * libtiff/tif_fax3.c: "inline static" -> "static inline" for IRIC CC.
2007-03-07 Joris Van Damme <joris.at.lebbeke@skynet.be>
diff --git a/libtiff/tif_fax3.c b/libtiff/tif_fax3.c
index 83f1fb21..ed988173 100644
--- a/libtiff/tif_fax3.c
+++ b/libtiff/tif_fax3.c
@@ -1,4 +1,4 @@
-/* $Id: tif_fax3.c,v 1.43 2006-10-12 18:11:30 dron Exp $ */
+/* $Id: tif_fax3.c,v 1.43.2.1 2007-03-28 21:48:16 fwarmerdam Exp $ */
/*
* Copyright (c) 1990-1997 Sam Leffler
@@ -776,7 +776,7 @@ static int32 find1span(unsigned char*, int32, int32);
* table. The ``base'' of the bit string is supplied
* along with the start+end bit indices.
*/
-inline static int32
+static inline int32
find0span(unsigned char* bp, int32 bs, int32 be)
{
int32 bits = be - bs;
@@ -835,7 +835,7 @@ find0span(unsigned char* bp, int32 bs, int32 be)
return (span);
}
-inline static int32
+static inline int32
find1span(unsigned char* bp, int32 bs, int32 be)
{
int32 bits = be - bs;