From: Tomek Mrugalski <tomek@isc.org>
Date: Thu, 12 May 2011 11:16:41 +0000 (+0000)
Subject: Compilation problem with gcc4.5 and omshell.c resolved. [ISC-Bugs #23831]
X-Git-Tag: v4_3_0a1~182
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c616de4f1e634718889fa47901cfbf862753a140;p=thirdparty%2Fdhcp.git

Compilation problem with gcc4.5 and omshell.c resolved. [ISC-Bugs #23831]
---

diff --git a/RELNOTES b/RELNOTES
index 635ac670a..469e22cb3 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -136,8 +136,10 @@ work on other platforms. Please report any problems and suggested fixes to
   [ISC-Bugs #22695] - Close a file descriptor in an error path.
   [ISC-Bugs #19368] - Tidy up variable types in validate_port.
 
-- Code cleanup
-  [ISC-Bugs #13151] - remove obsolete PROTO, KandR, INLINE and ANSI_DECL macros
+- Code cleanup: remove obsolete PROTO, KandR, INLINE and ANSI_DECL macros
+  [ISC-Bugs #13151] 
+
+- Compilation problem with gcc4.5 and omshell.c resolved. [ISC-Bugs #23831]
 
 			Changes since 4.2.0
 
diff --git a/dhcpctl/omshell.c b/dhcpctl/omshell.c
index 4da7428e9..ca918ce4e 100644
--- a/dhcpctl/omshell.c
+++ b/dhcpctl/omshell.c
@@ -190,11 +190,11 @@ main(int argc, char **argv) {
 		    break;
 		    
 		  case END_OF_FILE:
-		  case EOL:
+		  case ENDOFLINE: /* EOL: */
 		    break;
 		    
 		  case TOKEN_HELP:
-		  case '?':
+	          case QUESTIONMARK: /* '?': */
 		    printf ("Commands:\n");
 		    printf ("  port <server omapi port>\n");
 		    printf ("  server <server address>\n");
diff --git a/includes/dhctoken.h b/includes/dhctoken.h
index 5bc1e0b63..1d0c9e78c 100644
--- a/includes/dhctoken.h
+++ b/includes/dhctoken.h
@@ -3,8 +3,8 @@
    Tokens for config file lexer and parser. */
 
 /*
- * Copyright (c) 2004,2007-2009,2011 by 
- * Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2011 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004,2007-2009 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1996-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -47,12 +47,14 @@ enum dhcp_token {
 	TILDE = '~',
 	BANG = '!',
 	PERCENT = '%',
- 	PLUS = '+',
+	PLUS = '+',
 	MINUS = '-',
 	ASTERISK = '*',
 	AMPERSAND = '&',
 	PIPE = '|',
 	CARET = '^',
+	ENDOFLINE = '\n',
+	QUESTIONMARK = '?',
 
 	HOST = 256,
 	FIRST_TOKEN = HOST,