summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-06-03 00:48:42 +0000
committerKarl Berry <karl@freefriends.org>2009-06-03 00:48:42 +0000
commitceb1ef4d902d7ab7f4fa57a73b9235c480e38f13 (patch)
tree80ec98dd83101ed149be3028ca769fdc348f9949
parent8a2651fb8ab441337cb1482b2405335ca6aaf504 (diff)
omit non-inline definition in .h file, report from vvv
git-svn-id: svn://tug.org/texlive/trunk@13591 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/ttfdump/ChangeLog6
-rw-r--r--Build/source/texk/ttfdump/include/ttf.h21
2 files changed, 7 insertions, 20 deletions
diff --git a/Build/source/texk/ttfdump/ChangeLog b/Build/source/texk/ttfdump/ChangeLog
index cbaedc2192b..981cc2cd6ef 100644
--- a/Build/source/texk/ttfdump/ChangeLog
+++ b/Build/source/texk/ttfdump/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-03 Karl Berry <karl@tug.org>
+
+ * include/ttf.h (ttfGetBYTE): replace [non-inline] definition
+ here with declaration, referring to the definition in
+ libttf/ttfread.c. Report from vvv, tlbuild 02 Jun 2009 23:48:52.
+
2009-05-27 Peter Breitenlohner <peb@mppmu.mpg.de>
Adapt to TL2009 build system.
diff --git a/Build/source/texk/ttfdump/include/ttf.h b/Build/source/texk/ttfdump/include/ttf.h
index 34c53a3f298..8658345874b 100644
--- a/Build/source/texk/ttfdump/include/ttf.h
+++ b/Build/source/texk/ttfdump/include/ttf.h
@@ -41,26 +41,7 @@ typedef SHORT F2Dot14; /* 2.14 fixed point number used for
typedef LONG F26Dot6; /* 26.6 fixed point number to specify
* pixel positions */
-#ifndef inline
-extern inline BYTE
-ttfGetBYTE(FILE *fp)
-{
- int cc;
-
-
- if ((cc = fgetc (fp)) == EOF)
- {
-#if 0
- if (feof(fp) != 0)
- ttfError("Unexpected EOF \n");
- else
- ttfError("Error Getting BYTE\n");
-#endif
- }
- return (BYTE) cc;
-}
-#endif
-
+BYTE ttfGetBYTE(FILE *fp);
CHAR ttfGetCHAR(FILE *fp);
USHORT ttfGetUSHORT(FILE *fp);
USHORT ttfGetSHORT(FILE *fp);