From 72daa122b6a4a9562109299d0b747c71aac1e483 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 2 Feb 2011 11:48:58 +0100 Subject: package/config: rebase against 2.6.37-rc1 Signed-off-by: Peter Korsgaard --- package/config/lkc.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'package/config/lkc.h') diff --git a/package/config/lkc.h b/package/config/lkc.h index bdf71bd31..ec5b41820 100644 --- a/package/config/lkc.h +++ b/package/config/lkc.h @@ -31,12 +31,18 @@ extern "C" { #define SRCTREE "srctree" +#ifndef PACKAGE #define PACKAGE "linux" +#endif + #define LOCALEDIR "/usr/share/locale" #define _(text) gettext(text) #define N_(text) (text) +#ifndef CONFIG_ +#define CONFIG_ "BR2_" +#endif #define TF_COMMAND 0x0001 #define TF_PARAM 0x0002 @@ -70,7 +76,7 @@ FILE *zconf_fopen(const char *name); void zconf_initscan(const char *name); void zconf_nextfile(const char *name); int zconf_lineno(void); -char *zconf_curname(void); +const char *zconf_curname(void); /* conf.c */ void xfgets(char *str, int size, FILE *in); -- cgit v1.2.3