diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-17 16:30:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-17 16:30:24 -0800 |
| commit | 37861ffa8c28e6c479cf04a70b7d6cc33d23c2a8 (patch) | |
| tree | e64a32611c1a79cf6b45de4632b7016ead4d608a /scripts/kconfig/nconf.c | |
| parent | 41e0e24b450fadc079dfb659d81f3076afcfbd8a (diff) | |
| parent | 83c3a1bad224189f22ca2c1955337c3478bd3ab2 (diff) | |
| download | talos-op-linux-37861ffa8c28e6c479cf04a70b7d6cc33d23c2a8.tar.gz talos-op-linux-37861ffa8c28e6c479cf04a70b7d6cc33d23c2a8.zip | |
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kconfig updates from Michal Marek:
- 'make xconfig' gui fixes
- 'make nconfig' fix for options with long prompts
- fix 'make nconfig' warning when pkg-config forces -D_GNU_SOURCE
* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
xconfig: fix missing suboption and help panels on first run
xconfig: fix 'Show Debug' functionality
kconfig/nconf: Fix hang when editing symbol with a long prompt
Scripts: kconfig: nconf: fix _GNU_SOURCE redefined warning
Diffstat (limited to 'scripts/kconfig/nconf.c')
| -rw-r--r-- | scripts/kconfig/nconf.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c index d42d534a66cd..a9bc5334a478 100644 --- a/scripts/kconfig/nconf.c +++ b/scripts/kconfig/nconf.c @@ -5,7 +5,9 @@ * Derived from menuconfig. * */ +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif #include <string.h> #include <stdlib.h> |
