[svn:parrot] r46933 - in trunk: include/parrot src

[NotFound at svn.parrot.org]

Author: NotFound
Date: Mon May 24 00:49:53 2010
New Revision: 46933
URL: https://trac.parrot.org/parrot/changeset/46933

Log:
avoid conflicting name and consting

Modified:
   trunk/include/parrot/longopt.h
   trunk/src/longopt.c

Modified: trunk/include/parrot/longopt.h
==============================================================================
--- trunk/include/parrot/longopt.h	Mon May 24 00:34:02 2010	(r46932)
+++ trunk/include/parrot/longopt.h	Mon May 24 00:49:53 2010	(r46933)
@@ -52,7 +52,7 @@
 #define OPT_HASH_SEED      133
 
 PARROT_DATA
-const struct longopt_opt_decl *Parrot_cmd_options;
+const struct longopt_opt_decl * const Parrot_cmd_options;
 
 /* HEADERIZER BEGIN: src/longopt.c */
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */

Modified: trunk/src/longopt.c
==============================================================================
--- trunk/src/longopt.c	Mon May 24 00:34:02 2010	(r46932)
+++ trunk/src/longopt.c	Mon May 24 00:49:53 2010	(r46933)
@@ -62,7 +62,7 @@
 
 static char longopt_error_buffer[512];
 
-static const struct longopt_opt_decl _Parrot_cmd_options[] = {
+static const struct longopt_opt_decl cmd_options[] = {
     { '.', '.', (OPTION_flags)0, { "--wait" } },
     { 'D', 'D', OPTION_optional_FLAG, { "--parrot-debug" } },
     { 'E', 'E', (OPTION_flags)0, { "--pre-process-only" } },
@@ -94,7 +94,7 @@
     { 0, 0, (OPTION_flags)0, { NULL } }
 };
 
-const struct longopt_opt_decl *Parrot_cmd_options = _Parrot_cmd_options;
+const struct longopt_opt_decl * const Parrot_cmd_options = cmd_options;
 
 /*