jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 14:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
With commit b58bf60b519353e983e372f5627d639e7cc72a7a 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: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Peter Seiderer 2013-10-29 22:53:32 +01:00 committed by Thomas Petazzoni
parent f3a2b806de
commit 1690fca464
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
support/kconfig/confdata.c
View File

@ -13,6 +13,7 @@
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <libgen.h>
#include "lkc.h" #include "lkc.h"

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

@ -20,7 +20,15 @@ Index: b/confdata.c
=================================================================== ===================================================================
--- a/confdata.c --- a/confdata.c
+++ b/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) const char *conf_get_autoconfig_name(void)
{ {
@ -31,7 +39,7 @@ Index: b/confdata.c
} }
static char *conf_expand_value(const char *in) 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 dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1];
char *env; char *env;
@ -41,7 +49,7 @@ Index: b/confdata.c
dirname[0] = 0; dirname[0] = 0;
if (name && name[0]) { if (name && name[0]) {
struct stat st; struct stat st;
@@ -831,6 +832,7 @@ @@ -831,6 +833,7 @@
{ {
const char *name; const char *name;
char path[PATH_MAX+1]; char path[PATH_MAX+1];
@ -49,7 +57,7 @@ Index: b/confdata.c
char *s, *d, c; char *s, *d, c;
struct symbol *sym; struct symbol *sym;
struct stat sb; struct stat sb;
@@ -839,8 +841,20 @@ @@ -839,8 +842,20 @@
name = conf_get_autoconfig_name(); name = conf_get_autoconfig_name();
conf_read_simple(name, S_DEF_AUTO); conf_read_simple(name, S_DEF_AUTO);
@ -72,7 +80,7 @@ Index: b/confdata.c
res = 0; res = 0;
for_all_symbols(i, sym) { for_all_symbols(i, sym) {
@@ -933,9 +947,11 @@ @@ -933,9 +948,11 @@
close(fd); close(fd);
} }
out: out:
@ -87,7 +95,7 @@ Index: b/confdata.c
return res; return res;
} }
@@ -945,25 +961,38 @@ @@ -945,25 +962,38 @@
const char *name; const char *name;
FILE *out, *tristate, *out_h; FILE *out, *tristate, *out_h;
int i; int i;
@ -130,7 +138,7 @@ Index: b/confdata.c
if (!out_h) { if (!out_h) {
fclose(out); fclose(out);
fclose(tristate); fclose(tristate);
@@ -995,19 +1024,22 @@ @@ -995,19 +1025,22 @@
name = getenv("KCONFIG_AUTOHEADER"); name = getenv("KCONFIG_AUTOHEADER");
if (!name) if (!name)
name = "include/generated/autoconf.h"; name = "include/generated/autoconf.h";