From 965fc749130a420fb3d5dea9418937e1db0a5786 Mon Sep 17 00:00:00 2001
From: Olivier Matz <zer0@droids-corp.org>
Date: Fri, 24 Dec 2010 13:55:43 +0100
Subject: [PATCH] cmdline (merge-intel): reverse compilation flags for floats
 and socket

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---
 src/lib/cmdline_parse_num.c | 28 ++++++++++++++--------------
 src/lib/cmdline_socket.c    |  4 ++--
 src/lib/cmdline_socket.h    |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/lib/cmdline_parse_num.c b/src/lib/cmdline_parse_num.c
index 6c1ec72..1332efc 100644
--- a/src/lib/cmdline_parse_num.c
+++ b/src/lib/cmdline_parse_num.c
@@ -104,7 +104,7 @@ enum num_parse_state_t {
 static const char * num_help[] = {
 	"UINT8", "UINT16", "UINT32",
 	"INT8", "INT16", "INT32",
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
 	"FLOAT",
 #endif
 };
@@ -131,7 +131,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 	const char * buf = srcbuf;
 	char c = *buf;
 	uint32_t res1 = 0;
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
 	uint32_t res2 = 0, res3 = 1;
 #endif
 
@@ -147,7 +147,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 			else if (c == '0') {
 				st = ZERO_OK;
 			}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
 			else if (c == '.') {
 				st = FLOAT_POS;
 				res1 = 0;
@@ -171,7 +171,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 			else if (c == 'b') {
 				st = BIN;
 			}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
 			else if (c == '.') {
 				st = FLOAT_POS;
 				res1 = 0;
@@ -195,7 +195,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 				else
 					st = DEC_NEG_OK;
 			}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
 			else if (c == '.') {
 				res1 = 0;
 				st = FLOAT_NEG;
@@ -211,7 +211,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 				if (add_to_res(c - '0', &res1, 10) < 0)
 					st = ERROR;
 			}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
 			else if (c == '.') {
 				st = FLOAT_NEG;
 			}
@@ -226,7 +226,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 				if (add_to_res(c - '0', &res1, 10) < 0)
 					st = ERROR;
 			}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
 			else if (c == '.') {
 				st = FLOAT_POS;
 			}
@@ -281,7 +281,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 			}
 			break;
 
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
 		case FLOAT_POS:
 			if (c >= '0' && c <= '9') {
 				if (add_to_res(c - '0', &res2, 10) < 0)
@@ -338,11 +338,11 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 
 		}
 
-#ifdef CMDLINE_NO_FLOAT
-		debug_printf("(%"PRIu32")\n", res1);
-#else
+#ifdef CMDLINE_HAVE_FLOAT
 		debug_printf("(%"PRIu32")  (%"PRIu32")  (%"PRIu32")\n",
 			     res1, res2, res3);
+#else
+		debug_printf("(%"PRIu32")\n", res1);
 #endif
 
 		buf ++;
@@ -389,7 +389,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 				*(uint32_t *)res = (uint32_t) res1;
 			return (buf-srcbuf);
 		}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
 		else if ( nd.type == FLOAT ) {
 			if (res)
 				*(float *)res = (float)res1;
@@ -417,7 +417,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 				*(int32_t *)res = (int32_t) (-res1);
 			return (buf-srcbuf);
 		}
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
 		else if ( nd.type == FLOAT ) {
 			if (res)
 				*(float *)res = - (float)res1;
@@ -429,7 +429,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res)
 		}
 		break;
 
-#ifndef CMDLINE_NO_FLOAT
+#ifdef CMDLINE_HAVE_FLOAT
 	case FLOAT_POS:
 	case FLOAT_POS_OK:
 		if ( nd.type == FLOAT ) {
diff --git a/src/lib/cmdline_socket.c b/src/lib/cmdline_socket.c
index f9cfebd..4474c6f 100644
--- a/src/lib/cmdline_socket.c
+++ b/src/lib/cmdline_socket.c
@@ -68,7 +68,7 @@
 #include <fcntl.h>
 #include <termios.h>
 
-#ifndef CMDLINE_NO_SOCKET
+#ifdef CMDLINE_HAVE_SOCKET
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
@@ -82,7 +82,7 @@
 
 /**********************/
 
-#ifndef CMDLINE_NO_SOCKET
+#ifdef CMDLINE_HAVE_SOCKET
 int
 cmdline_tcpv4_listen(in_addr_t addr, uint16_t port)
 {
diff --git a/src/lib/cmdline_socket.h b/src/lib/cmdline_socket.h
index 37a378d..064b27e 100644
--- a/src/lib/cmdline_socket.h
+++ b/src/lib/cmdline_socket.h
@@ -62,7 +62,7 @@
 #ifndef _CMDLINE_SOCKET_H_
 #define _CMDLINE_SOCKET_H_
 
-#ifndef CMDLINE_NO_SOCKET
+#ifdef CMDLINE_HAVE_SOCKET
 int cmdline_tcpv4_listen(in_addr_t addr, uint16_t port);
 int cmdline_tcpv6_listen(uint16_t port);
 int cmdline_unix_listen(char *filename);
-- 
2.20.1