--- src/cf.extern.h	2005-03-17 09:36:40.000000000 -0800
+++ src/cf.extern.h.gcc4	2005-03-17 09:37:24.000000000 -0800
@@ -28,6 +28,10 @@
 /*                                                                 */
 /*******************************************************************/
 
+#ifndef _GETOPT_H
+#include "../pub/getopt.h"
+#endif
+
 #if defined HAVE_PTHREAD_H && (defined HAVE_LIBPTHREAD || defined BUILDTIN_GCC_THREAD)
 extern pthread_mutex_t MUTEX_SYSCALL;
 extern pthread_mutex_t MUTEX_LOCK;
@@ -70,7 +74,7 @@
 extern char *tzname[2];
 extern char *optarg;
 extern int optind;
-extern struct option OPTIONS[];
+extern struct option OPTIONS[49];
 extern int CFSIGNATURE;
 extern char CFDES1[8];
 extern char CFDES2[8];
--- src/globals.c	2005-03-17 09:37:00.000000000 -0800
+++ src/globals.c.gcc4	2005-03-17 09:36:16.000000000 -0800
@@ -394,7 +394,7 @@
   /* GNU STUFF FOR LATER #include "getopt.h" */
  
  
- PRIVATE struct option OPTIONS[] =
+ PRIVATE struct option OPTIONS[49] =
       {
       { "help",no_argument,0,'h' },
       { "debug",optional_argument,0,'d' },