diff -c -r -N ../Ice-3.1.0/src/slice2cpp/Main.cpp ./src/slice2cpp/Main.cpp
*** ../Ice-3.1.0/src/slice2cpp/Main.cpp	Thu Jun 29 00:52:03 2006
--- ./src/slice2cpp/Main.cpp	Mon Oct  2 10:30:25 2006
***************
*** 114,120 ****
  	vector<string> optargs = opts.argVec("D");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -D" + *i;
  	}
      }
      if(opts.isSet("U"))
--- 114,120 ----
  	vector<string> optargs = opts.argVec("D");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -D\"" + *i + "\"";
  	}
      }
      if(opts.isSet("U"))
***************
*** 122,128 ****
  	vector<string> optargs = opts.argVec("U");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -U" + *i;
  	}
      }
      if(opts.isSet("I"))
--- 122,128 ----
  	vector<string> optargs = opts.argVec("U");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -U\"" + *i + "\"";
  	}
      }
      if(opts.isSet("I"))
***************
*** 130,136 ****
  	includePaths = opts.argVec("I");
  	for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
  	{
! 	    cppArgs += " -I" + *i;
  	}
      }
      preprocess = opts.isSet("E");
--- 130,136 ----
  	includePaths = opts.argVec("I");
  	for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
  	{
! 	    cppArgs += " -I\"" + *i + "\"";
  	}
      }
      preprocess = opts.isSet("E");
diff -c -r -N ../Ice-3.1.0/src/slice2cs/Main.cpp ./src/slice2cs/Main.cpp
*** ../Ice-3.1.0/src/slice2cs/Main.cpp	Thu Jun 29 00:52:03 2006
--- ./src/slice2cs/Main.cpp	Mon Oct  2 10:30:25 2006
***************
*** 102,108 ****
          vector<string> optargs = opts.argVec("D");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -D" + *i;
  	}
      }
      if(opts.isSet("U"))
--- 102,108 ----
          vector<string> optargs = opts.argVec("D");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -D\"" + *i + "\"";
  	}
      }
      if(opts.isSet("U"))
***************
*** 110,116 ****
          vector<string> optargs = opts.argVec("U");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -U" + *i;
  	}
      }
      if(opts.isSet("I"))
--- 110,116 ----
          vector<string> optargs = opts.argVec("U");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -U\"" + *i + "\"";
  	}
      }
      if(opts.isSet("I"))
***************
*** 118,124 ****
  	includePaths = opts.argVec("I");
  	for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
  	{
! 	    cppArgs += " -I" + *i;
  	}
      }
      preprocess = opts.isSet("E");
--- 118,124 ----
  	includePaths = opts.argVec("I");
  	for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
  	{
! 	    cppArgs += " -I\"" + *i + "\"";
  	}
      }
      preprocess = opts.isSet("E");
diff -c -r -N ../Ice-3.1.0/src/slice2docbook/Main.cpp ./src/slice2docbook/Main.cpp
*** ../Ice-3.1.0/src/slice2docbook/Main.cpp	Thu Jun 29 00:52:03 2006
--- ./src/slice2docbook/Main.cpp	Mon Oct  2 10:30:25 2006
***************
*** 97,103 ****
  	vector<string> optargs = opts.argVec("D");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -D" + *i;
  	}
      }
      if(opts.isSet("U"))
--- 97,103 ----
  	vector<string> optargs = opts.argVec("D");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -D\"" + *i + "\"";
  	}
      }
      if(opts.isSet("U"))
***************
*** 105,111 ****
  	vector<string> optargs = opts.argVec("U");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -U" + *i;
  	}
      }
      if(opts.isSet("I"))
--- 105,111 ----
  	vector<string> optargs = opts.argVec("U");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -U\"" + *i + "\"";
  	}
      }
      if(opts.isSet("I"))
***************
*** 113,119 ****
  	vector<string> optargs = opts.argVec("I");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -I" + *i;
  	}
      }
      preprocess = opts.isSet("E");
--- 113,119 ----
  	vector<string> optargs = opts.argVec("I");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -I\"" + *i + "\"";
  	}
      }
      preprocess = opts.isSet("E");
diff -c -r -N ../Ice-3.1.0/src/slice2freeze/Main.cpp ./src/slice2freeze/Main.cpp
*** ../Ice-3.1.0/src/slice2freeze/Main.cpp	Thu Jun 29 00:52:03 2006
--- ./src/slice2freeze/Main.cpp	Mon Oct  2 10:30:25 2006
***************
*** 1243,1249 ****
  	vector<string> optargs = opts.argVec("D");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -D" + *i;
  	}
      }
      if(opts.isSet("U"))
--- 1243,1249 ----
  	vector<string> optargs = opts.argVec("D");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -D\"" + *i + "\"";
  	}
      }
      if(opts.isSet("U"))
***************
*** 1251,1257 ****
  	vector<string> optargs = opts.argVec("U");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -U" + *i;
  	}
      }
      if(opts.isSet("I"))
--- 1251,1257 ----
  	vector<string> optargs = opts.argVec("U");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -U\"" + *i + "\"";
  	}
      }
      if(opts.isSet("I"))
***************
*** 1259,1265 ****
  	includePaths = opts.argVec("I");
  	for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
  	{
! 	    cppArgs += " -I" + *i;
  	}
      }
      preprocess= opts.isSet("E");
--- 1259,1265 ----
  	includePaths = opts.argVec("I");
  	for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
  	{
! 	    cppArgs += " -I\"" + *i + "\"";
  	}
      }
      preprocess= opts.isSet("E");
diff -c -r -N ../Ice-3.1.0/src/slice2freezej/Main.cpp ./src/slice2freezej/Main.cpp
*** ../Ice-3.1.0/src/slice2freezej/Main.cpp	Thu Jun 29 00:52:03 2006
--- ./src/slice2freezej/Main.cpp	Mon Oct  2 10:30:26 2006
***************
*** 1127,1133 ****
  	vector<string> optargs = opts.argVec("D");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -D" + *i;
  	}
      }
      if(opts.isSet("U"))
--- 1127,1133 ----
  	vector<string> optargs = opts.argVec("D");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -D\"" + *i + "\"";
  	}
      }
      if(opts.isSet("U"))
***************
*** 1135,1141 ****
  	vector<string> optargs = opts.argVec("U");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -U" + *i;
  	}
      }
      if(opts.isSet("I"))
--- 1135,1141 ----
  	vector<string> optargs = opts.argVec("U");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -U\"" + *i + "\"";
  	}
      }
      if(opts.isSet("I"))
***************
*** 1143,1149 ****
  	includePaths = opts.argVec("I");
  	for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
  	{
! 	    cppArgs += " -I" + *i;
  	}
      }
      preprocess = opts.isSet("E");
--- 1143,1149 ----
  	includePaths = opts.argVec("I");
  	for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
  	{
! 	    cppArgs += " -I\"" + *i + "\"";
  	}
      }
      preprocess = opts.isSet("E");
diff -c -r -N ../Ice-3.1.0/src/slice2java/Main.cpp ./src/slice2java/Main.cpp
*** ../Ice-3.1.0/src/slice2java/Main.cpp	Thu Jun 29 00:52:03 2006
--- ./src/slice2java/Main.cpp	Mon Oct  2 10:30:26 2006
***************
*** 105,111 ****
          vector<string> optargs = opts.argVec("D");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -D" + *i;
  	}
      }
      if(opts.isSet("U"))
--- 105,111 ----
          vector<string> optargs = opts.argVec("D");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -D\"" + *i + "\"";
  	}
      }
      if(opts.isSet("U"))
***************
*** 113,119 ****
          vector<string> optargs = opts.argVec("U");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -U" + *i;
  	}
      }
      if(opts.isSet("I"))
--- 113,119 ----
          vector<string> optargs = opts.argVec("U");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -U\"" + *i + "\"";
  	}
      }
      if(opts.isSet("I"))
***************
*** 121,127 ****
          includePaths = opts.argVec("I");
  	for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
  	{
! 	    cppArgs += " -I" + *i;
  	}
      }
      preprocess = opts.isSet("E");
--- 121,127 ----
          includePaths = opts.argVec("I");
  	for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
  	{
! 	    cppArgs += " -I\"" + *i + "\"";
  	}
      }
      preprocess = opts.isSet("E");
diff -c -r -N ../Ice-3.1.0/src/slice2py/Main.cpp ./src/slice2py/Main.cpp
*** ../Ice-3.1.0/src/slice2py/Main.cpp	Thu Jun 29 00:52:03 2006
--- ./src/slice2py/Main.cpp	Mon Oct  2 10:30:26 2006
***************
*** 439,445 ****
  	vector<string> optargs = opts.argVec("D");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -D" + *i;
  	}
      }
      if(opts.isSet("U"))
--- 439,445 ----
  	vector<string> optargs = opts.argVec("D");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -D\"" + *i + "\"";
  	}
      }
      if(opts.isSet("U"))
***************
*** 447,453 ****
  	vector<string> optargs = opts.argVec("U");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -U" + *i;
  	}
      }
      if(opts.isSet("I"))
--- 447,453 ----
  	vector<string> optargs = opts.argVec("U");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
! 	    cppArgs += " -U\"" + *i + "\"";
  	}
      }
      if(opts.isSet("I"))
***************
*** 455,461 ****
  	includePaths = opts.argVec("I");
  	for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
  	{
! 	    cppArgs += " -I" + *i;
  	}
      }
      preprocess = opts.isSet("E");
--- 455,461 ----
  	includePaths = opts.argVec("I");
  	for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
  	{
! 	    cppArgs += " -I\"" + *i + "\"";
  	}
      }
      preprocess = opts.isSet("E");
diff -c -r -N ../Ice-3.1.0/src/slice2vb/Main.cpp ./src/slice2vb/Main.cpp
*** ../Ice-3.1.0/src/slice2vb/Main.cpp	Thu Jun 29 00:52:03 2006
--- ./src/slice2vb/Main.cpp	Mon Oct  2 10:30:26 2006
***************
*** 102,108 ****
          vector<string> optargs = opts.argVec("D");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
!             cppArgs += " -D" + *i;
  	}
      }
      if(opts.isSet("U"))
--- 102,108 ----
          vector<string> optargs = opts.argVec("D");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
!             cppArgs += " -D\"" + *i + "\"";
  	}
      }
      if(opts.isSet("U"))
***************
*** 110,116 ****
          vector<string> optargs = opts.argVec("U");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
!             cppArgs += " -U" + *i;
  	}
      }
      if(opts.isSet("I"))
--- 110,116 ----
          vector<string> optargs = opts.argVec("U");
  	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
  	{
!             cppArgs += " -U\"" + *i + "\"";
  	}
      }
      if(opts.isSet("I"))
***************
*** 118,124 ****
          includePaths = opts.argVec("I");
  	for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
  	{
!             cppArgs += " -I" + *i;
  	}
      }
      preprocess = opts.isSet("E");
--- 118,124 ----
          includePaths = opts.argVec("I");
  	for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
  	{
!             cppArgs += " -I\"" + *i + "\"";
  	}
      }
      preprocess = opts.isSet("E");