From 3d861475f7007dd99ab760355e9f49ae8303c900 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Mon, 17 Oct 2011 17:39:47 +0100
Subject: [PATCH] Fix two issues caught by the German QA department ;)

---
 src/Main/options.cxx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index e63fac009..6dd374a85 100644
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -79,6 +79,7 @@ using std::sort;
 using std::cout;
 using std::cerr;
 using std::endl;
+using std::vector;
 
 #define NEW_DEFAULT_MODEL_HZ 120
 
@@ -182,7 +183,7 @@ fgSetDefaults ()
 #elif defined(sgi)
     fgSetString("/sim/startup/browser-app", "launchWebJumper");
 #else
-    char* browserEnv = ::getenv( "WEBBROWSER" );
+    const char* browserEnv = ::getenv( "WEBBROWSER" );
     if (!browserEnv) browserEnv = "netscape";
     fgSetString("/sim/startup/browser-app", browserEnv);
 #endif
@@ -1661,7 +1662,8 @@ Options::Options() :
 // build option map
   OptionDesc *desc = &fgOptionArray[ 0 ];
   while ( desc->option != 0 ) {
-    p->options[ desc->option ] = desc++;
+    p->options[ desc->option ] = desc;
+    ++desc;
   }
 }
   
-- 
2.39.5