From 862d9405b857dba35f8f2eb6d0623b9a552d4353 Mon Sep 17 00:00:00 2001
From: delphij <delphij@FreeBSD.org>
Date: Mon, 18 May 2009 22:27:42 +0000
Subject: Virgin import of Christos Zoulas's FILE 5.03.

Security:	CVE-2009-1515
---
 file.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'file.c')

diff --git a/file.c b/file.c
index 9b4747b..34aa44c 100644
--- a/file.c
+++ b/file.c
@@ -32,7 +32,7 @@
 #include "file.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$File: file.c,v 1.130 2009/02/03 20:27:51 christos Exp $")
+FILE_RCSID("@(#)$File: file.c,v 1.131 2009/02/13 18:48:05 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
@@ -61,7 +61,7 @@ FILE_RCSID("@(#)$File: file.c,v 1.130 2009/02/03 20:27:51 christos Exp $")
 #include <wchar.h>
 #endif
 
-#ifdef HAVE_GETOPT_H
+#if defined(HAVE_GETOPT_H) && defined(HAVE_STRUCT_OPTION)
 #include <getopt.h>
 #else
 #include "mygetopt.h"
-- 
cgit v1.1