Merge GDB 7.5.1

gdb/mi/mi-getopt.h

Index: gdb/mi/mi-getopt.h
diff --git a/gdb/mi/mi-getopt.h b/gdb/mi/mi-getopt.h
index ea09b4407032de2e88b378729dea3495a8741cdc..bfb305db3a9894a7f10cab0fcb7409410bdeb3c7 100644
--- a/gdb/mi/mi-getopt.h
+++ b/gdb/mi/mi-getopt.h
@@ -20,6 +20,16 @@
 #ifndef MI_GETOPT_H
 #define MI_GETOPT_H
 
+/* The option list.  Terminated by NAME==NULL.  ARG_P that the option
+   requires an argument.  INDEX is returned to identify the option.  */
+
+struct mi_opt
+  {
+    const char *name;
+    int index;
+    int arg_p;
+  };
+
 /* Like getopt() but with simpler semantics.
 
    An option has the form ``-<name>''. The special option ``--''
@@ -37,30 +47,16 @@
    to specify the non-option argument.  OPTARG is set to NULL.
 
    mi_getopt() calls ``error("%s: Unknown option %c", prefix,
-   option)'' if an unknown option is encountered. */
+   option)'' if an unknown option is encountered.  */
 
-struct mi_opt;
 extern int mi_getopt (const char *prefix, int argc, char **argv,
 		      const struct mi_opt *opt, int *optind, char **optarg);
 
-/* The option list.  Terminated by NAME==NULL.  ARG_P that the option
-   requires an argument.  INDEX is returned to identify th option. */
-
-struct mi_opt
-  {
-    const char *name;
-    int index;
-    int arg_p;
-  };
-
-struct mi_opt;
-
-/* mi_valid_noargs
-   
-   Determines if ARGC/ARGV are a valid set of parameters to satisfy 
-   an MI function that is not supposed to recieve any arguments.
+/* mi_valid_noargs determines if ARGC/ARGV are a valid set of
+   parameters to satisfy an MI function that is not supposed to
+   recieve any arguments.
    
-   An MI function that should not recieve arguments can still be 
+   An MI function that should not receive arguments can still be 
    passed parameters after the special option '--' such as below.
 
    Example: The MI function -exec-run takes no args.