More patches from pbatard to reduce warnings, etc.

src/iso-read.c

@@ -1,7 +1,5 @@
 /*
-  $Id: iso-read.c,v 1.16 2008/06/19 15:44:19 flameeyes Exp $
-
-  Copyright (C) 2004, 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
+  Copyright (C) 2004, 2005, 2006, 2008, 2012 Rocky Bernstein <rocky@gnu.org>
   
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,7 +18,7 @@
 /* Program to read ISO-9660 images. */
 
 #include "util.h"
-#include "filemode.h"
+#include "portable.h"
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"