diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
index e7deadf7..e41bea28 100644
--- a/libtiff/tif_dirread.c
+++ b/libtiff/tif_dirread.c
@@ -1,4 +1,4 @@
-/* $Id: tif_dirread.c,v 1.54 2005-05-22 17:36:50 fwarmerdam Exp $ */
+/* $Id: tif_dirread.c,v 1.55 2005-07-12 12:22:03 dron Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -33,9 +33,9 @@
 
 #define	IGNORE	0		/* tag placeholder used below */
 
-#if HAVE_IEEEFP
-#define	TIFFCvtIEEEFloatToNative(tif, n, fp)
-#define	TIFFCvtIEEEDoubleToNative(tif, n, dp)
+#ifdef HAVE_IEEEFP
+# define	TIFFCvtIEEEFloatToNative(tif, n, fp)
+# define	TIFFCvtIEEEDoubleToNative(tif, n, dp)
 #else
 extern	void TIFFCvtIEEEFloatToNative(TIFF*, uint32, float*);
 extern	void TIFFCvtIEEEDoubleToNative(TIFF*, uint32, double*);
@@ -90,9 +90,9 @@ TIFFReadDirectory(TIFF* tif)
 {
 	static const char module[] = "TIFFReadDirectory";
 
-	register TIFFDirEntry* dp;
-	register int n;
-	register TIFFDirectory* td;
+	TIFFDirEntry* dp;
+	int n;
+	TIFFDirectory* td;
 	TIFFDirEntry* dir;
 	uint16 iv;
 	uint32 v;
@@ -689,6 +689,16 @@ bad:
 	return (0);
 }
 
+/*
+ */
+int
+TIFFReadCustomDirectory(TIFF* tif, toff_t diroff)
+{
+	static const char module[] = "TIFFReadCustomDirectory";
+
+	return 1;
+}
+
 static int
 EstimateStripByteCounts(TIFF* tif, TIFFDirEntry* dir, uint16 dircount)
 {
diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c
index 150418c6..b3abc4b3 100644
--- a/libtiff/tif_dirwrite.c
+++ b/libtiff/tif_dirwrite.c
@@ -1,4 +1,4 @@
-/* $Id: tif_dirwrite.c,v 1.28 2005-05-26 07:50:38 dron Exp $ */
+/* $Id: tif_dirwrite.c,v 1.29 2005-07-12 12:23:42 dron Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -31,9 +31,9 @@
  */
 #include "tiffiop.h"
 
-#if HAVE_IEEEFP
-#define	TIFFCvtNativeToIEEEFloat(tif, n, fp)
-#define	TIFFCvtNativeToIEEEDouble(tif, n, dp)
+#ifdef HAVE_IEEEFP
+# define	TIFFCvtNativeToIEEEFloat(tif, n, fp)
+# define	TIFFCvtNativeToIEEEDouble(tif, n, dp)
 #else
 extern	void TIFFCvtNativeToIEEEFloat(TIFF*, uint32, float*);
 extern	void TIFFCvtNativeToIEEEDouble(TIFF*, uint32, double*);