2007-05-31 Frank Ch. Eigler <fche@redhat.com>

	From Andi Kleen <ak@suse.de>:
	* mf-runtime.c (options): Rename structure for compatibility with
	glibc getopt_long.

From-SVN: r125237

diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog
index c2d3efafbfd25d18310212910415c7911bd63caa..cf70940edf39f3baff791cda6d0c7004aeb3bf4b 100644 (file)
--- a/libmudflap/ChangeLog
+++ b/libmudflap/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-31  Frank Ch. Eigler  <fche@redhat.com>
+
+       From Andi Kleen <ak@suse.de>:
+       * mf-runtime.c (options): Rename structure for compatibility with
+       glibc getopt_long.
+
 2007-05-23  Steve Ellcey  <sje@cup.hp.com>
 
        * Makefile.in: Regenerate.

diff --git a/libmudflap/mf-runtime.c b/libmudflap/mf-runtime.c
index 8501cca6feef030ceb33d2179b2c8004946c92d6..93765ab42204f2e00b8f2f769f3c865aff38af57 100644 (file)
--- a/libmudflap/mf-runtime.c
+++ b/libmudflap/mf-runtime.c
@@ -309,7 +309,7 @@ __mf_set_default_options ()
 #endif
 }
 
-static struct option
+static struct mudoption
 {
   char *name;
   char *description;
@@ -440,7 +440,7 @@ options [] =
 static void
 __mf_usage ()
 {
-  struct option *opt;
+  struct mudoption *opt;
 
   fprintf (stderr,
            "This is a %s%sGCC \"mudflap\" memory-checked binary.\n"
@@ -514,7 +514,7 @@ __mf_set_options (const char *optstr)
 int
 __mfu_set_options (const char *optstr)
 {
-  struct option *opts = 0;
+  struct mudoption *opts = 0;
   char *nxt = 0;
   long tmp = 0;
   int rc = 0;