summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Kew <jfkthame@googlemail.com>2006-12-09 10:29:12 +0000
committerJonathan Kew <jfkthame@googlemail.com>2006-12-09 10:29:12 +0000
commit84ed42c114f83ff43c50519956e9d5a1f03f48a7 (patch)
treef735818872a1c011279df6c1aa02a089d148c6b5
parentb1875e8b61fed1cf86021172dae6bff7676ff286 (diff)
fixes for AIX build
git-svn-id: svn://tug.org/texlive/trunk@2651 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/lib/texmfmp.c2
-rw-r--r--Build/source/texk/web2c/xetexdir/pdfimage.cpp11
2 files changed, 10 insertions, 3 deletions
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index 8d464a9a582..eb6636853a1 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -1602,7 +1602,7 @@ input_line P1C(FILE *, f)
return true;
}
- #endif /* !XeTeX */
+#endif /* !XeTeX */
/* This string specifies what the `e' option does in response to an
error message. */
diff --git a/Build/source/texk/web2c/xetexdir/pdfimage.cpp b/Build/source/texk/web2c/xetexdir/pdfimage.cpp
index c5eb2fedcec..21af77c6572 100644
--- a/Build/source/texk/web2c/xetexdir/pdfimage.cpp
+++ b/Build/source/texk/web2c/xetexdir/pdfimage.cpp
@@ -18,6 +18,13 @@
#include "XeTeX_ext.h"
+/* use our own fmin function because it seems to be missing on certain platforms */
+inline double
+my_fmin(double x, double y)
+{
+ return (x < y) ? x : y;
+}
+
int
pdf_get_rect(char* filename, int page_num, int pdf_box, realrect* box)
{
@@ -66,8 +73,8 @@ pdf_get_rect(char* filename, int page_num, int pdf_box, realrect* box)
break;
}
- box->x = 72 / 72.27 * fmin(r->x1, r->x2);
- box->y = 72 / 72.27 * fmin(r->y1, r->y2);
+ box->x = 72 / 72.27 * my_fmin(r->x1, r->x2);
+ box->y = 72 / 72.27 * my_fmin(r->y1, r->y2);
box->wd = 72 / 72.27 * fabs(r->x2 - r->x1);
box->ht = 72 / 72.27 * fabs(r->y2 - r->y1);