Commit 1690fca4 authored by Peter Seiderer's avatar Peter Seiderer Committed by Thomas Petazzoni
Browse files

support/kconfig: fix compile warning because of missing include. 



With commit b58bf60b the libgen.h
include was removed from confdata.c, but it is needed for the dirname
function declaration.

Fixes the following compile warning:
./confdata.c: In function ‘conf_split_config’:
./confdata.c:849:6: warning: assignment makes pointer from integer
without a cast

Signed-off-by: default avatarPeter Seiderer <ps.report@gmx.net>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent f3a2b806

support/kconfig/confdata.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <string.h>

#include <time.h>

#include <unistd.h>

#include <libgen.h>



#include "lkc.h"

support/kconfig/patches/14-support-out-of-tree-config.patch

+15 −7
Original line number Diff line number Diff line
@@ -20,7 +20,15 @@ Index: b/confdata.c 
===================================================================

--- a/confdata.c

+++ b/confdata.c

@@ -70,9 +70,7 @@

@@ -13,6 +13,7 @@

 #include <string.h>

 #include <time.h>

 #include <unistd.h>

+#include <libgen.h>

 

 #include "lkc.h"

 

@@ -70,9 +71,7 @@

 

 const char *conf_get_autoconfig_name(void)

 {
@@ -31,7 +39,7 @@ Index: b/confdata.c 
 }

 

 static char *conf_expand_value(const char *in)

@@ -737,6 +735,9 @@

@@ -737,6 +736,9 @@

 	char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1];

 	char *env;
@@ -41,7 +49,7 @@ Index: b/confdata.c 
 	dirname[0] = 0;

 	if (name && name[0]) {

 		struct stat st;

@@ -831,6 +832,7 @@

@@ -831,6 +833,7 @@

 {

 	const char *name;

 	char path[PATH_MAX+1];
@@ -49,7 +57,7 @@ Index: b/confdata.c 
 	char *s, *d, c;

 	struct symbol *sym;

 	struct stat sb;

@@ -839,8 +841,20 @@

@@ -839,8 +842,20 @@

 	name = conf_get_autoconfig_name();

 	conf_read_simple(name, S_DEF_AUTO);
@@ -72,7 +80,7 @@ Index: b/confdata.c 
 

 	res = 0;

 	for_all_symbols(i, sym) {

@@ -933,9 +947,11 @@

@@ -933,9 +948,11 @@

 		close(fd);

 	}

 out:
@@ -87,7 +95,7 @@ Index: b/confdata.c 
 	return res;

 }

 

@@ -945,25 +961,38 @@

@@ -945,25 +962,38 @@

 	const char *name;

 	FILE *out, *tristate, *out_h;

 	int i;
@@ -130,7 +138,7 @@ Index: b/confdata.c 
 	if (!out_h) {

 		fclose(out);

 		fclose(tristate);

@@ -995,19 +1024,22 @@

@@ -995,19 +1025,22 @@

 	name = getenv("KCONFIG_AUTOHEADER");

 	if (!name)

 		name = "include/generated/autoconf.h";