OpenSolaris (non-gcc) fixes, patches from Dagobert Michelsen <dam@opencsw.org>

with some changes.

1 files changed, 1 insertions, 8 deletions

diff --git a/conf.c b/conf.c
index 2bb938fa..b5993b4b 100644
--- a/conf.c
+++ b/conf.c
@@ -81,7 +81,7 @@ conf_t *conf_load( int argc, char *argv[] )
 		   at a *valid* configuration file. */
 	}
 	
-	while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hR:u:V" ) ) >= 0 )
+	while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hu:V" ) ) >= 0 )
 	/*     ^^^^ Just to make sure we skip this step from the REHASH handler. */
 	{
 		if( opt == 'i' )
@@ -157,13 +157,6 @@ conf_t *conf_load( int argc, char *argv[] )
 			        BITLBEE_VERSION, BITLBEE_VERSION_CODE );
 			return NULL;
 		}
-		else if( opt == 'R' )
-		{
-			/* Backward compatibility; older BitlBees passed this
-			   info using a command-line flag. Allow people to
-			   upgrade from such a version for now. */
-			setenv( "_BITLBEE_RESTART_STATE", optarg, 0 );
-		}
 		else if( opt == 'u' )
 		{
 			g_free( conf->user );