r3592 - in trunk/payloads/libpayload: . util/kconfig

Author: oxygene
Date: 2008-09-23 23:29:53 +0200 (Tue, 23 Sep 2008)
New Revision: 3592

Modified:
   trunk/payloads/libpayload/Makefile
   trunk/payloads/libpayload/util/kconfig/expr.h
   trunk/payloads/libpayload/util/kconfig/zconf.tab.c_shipped
Log:
1.
Preset CC to gcc in Makefile. There are some $(shell $(CC) ...)
invocations with GCC specific options, so that shouldn't hurt.

2.
Replace stdbool.h include in util/kconfig/expr.h by a custom
implementation of booleans. This is okay as these booleans are purely
internal. It's necessary because there's some disagreement between the
Solaris headers and GCC on Solaris, about when stdbool.h is appropriate.

3.
Remove stdbool.h include from util/kconfig/zconf.tab.c_shipped. This
file includes expr.h already, so it picks up the right set of
primitives, without duplicating the special case for Solaris.

Signed-off-by: Patrick Georgi 
Acked-by: Peter Stuge

Modified: trunk/payloads/libpayload/Makefile
===================================================================
--- trunk/payloads/libpayload/Makefile	2008-09-23 20:36:03 UTC (rev 3591)
+++ trunk/payloads/libpayload/Makefile	2008-09-23 21:29:53 UTC (rev 3592)
@@ -49,6 +49,7 @@
 Q := @
 endif

+CC = gcc
 HOSTCC = gcc
 HOSTCXX = g++
 HOSTCFLAGS := -I$(srck) -I$(objk)

Modified: trunk/payloads/libpayload/util/kconfig/expr.h
===================================================================
--- trunk/payloads/libpayload/util/kconfig/expr.h	2008-09-23 20:36:03 UTC (rev 3591)
+++ trunk/payloads/libpayload/util/kconfig/expr.h	2008-09-23 21:29:53 UTC (rev 3592)
@@ -12,8 +12,13 @@

#include <stdio.h>
 #ifndef __cplusplus
+#ifndef __sun
 #include <stdbool.h>
+#else
+typedef short bool;
+enum { true=1, false=0};
 #endif
+#endif

struct file {
    struct file *next;

Modified: trunk/payloads/libpayload/util/kconfig/zconf.tab.c_shipped
===================================================================
--- trunk/payloads/libpayload/util/kconfig/zconf.tab.c_shipped	2008-09-23 20:36:03 UTC (rev 3591)
+++ trunk/payloads/libpayload/util/kconfig/zconf.tab.c_shipped	2008-09-23 21:29:53 UTC (rev 3592)
@@ -158,7 +158,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdbool.h>

#define LKC_DIRECT_LINK
 #include "lkc.h"