* [-mm PATCH] drivers/char/speakup/synthlist.h - Fix warnings with -Wundef
@ 2005-08-23 20:00 Nick Sillik
2005-08-24 5:37 ` Alexey Dobriyan
0 siblings, 1 reply; 5+ messages in thread
From: Nick Sillik @ 2005-08-23 20:00 UTC (permalink / raw)
To: linux-kernel, Andrew Morton
[-- Attachment #1: Type: text/plain, Size: 4712 bytes --]
This patch fixes (it should) the following warnings generated with -Wundef in the file
drivers/char/speakup/synthlist.h
drivers/char/speakup/synthlist.h:13:35: warning: "CONFIG_SPEAKUP_ACNTPC" is not defined
drivers/char/speakup/synthlist.h:16:35: warning: "CONFIG_SPEAKUP_ACNTSA" is not defined
drivers/char/speakup/synthlist.h:19:35: warning: "CONFIG_SPEAKUP_APOLLO" is not defined
drivers/char/speakup/synthlist.h:22:35: warning: "CONFIG_SPEAKUP_AUDPTR" is not defined
drivers/char/speakup/synthlist.h:25:32: warning: "CONFIG_SPEAKUP_BNS" is not defined
drivers/char/speakup/synthlist.h:28:35: warning: "CONFIG_SPEAKUP_DECEXT" is not defined
drivers/char/speakup/synthlist.h:31:35: warning: "CONFIG_SPEAKUP_DECTLK" is not defined
drivers/char/speakup/synthlist.h:34:33: warning: "CONFIG_SPEAKUP_DTLK" is not defined
drivers/char/speakup/synthlist.h:37:34: warning: "CONFIG_SPEAKUP_KEYPC" is not defined
drivers/char/speakup/synthlist.h:40:33: warning: "CONFIG_SPEAKUP_LTLK" is not defined
drivers/char/speakup/synthlist.h:43:35: warning: "CONFIG_SPEAKUP_SFTSYN" is not defined
drivers/char/speakup/synthlist.h:46:35: warning: "CONFIG_SPEAKUP_SPKOUT" is not defined
drivers/char/speakup/synthlist.h:49:34: warning: "CONFIG_SPEAKUP_TXPRT" is not defined
drivers/char/speakup/synthlist.h:13:35: warning: "CONFIG_SPEAKUP_ACNTPC" is not defined
drivers/char/speakup/synthlist.h:16:35: warning: "CONFIG_SPEAKUP_ACNTSA" is not defined
drivers/char/speakup/synthlist.h:19:35: warning: "CONFIG_SPEAKUP_APOLLO" is not defined
drivers/char/speakup/synthlist.h:22:35: warning: "CONFIG_SPEAKUP_AUDPTR" is not defined
drivers/char/speakup/synthlist.h:25:32: warning: "CONFIG_SPEAKUP_BNS" is not defined
drivers/char/speakup/synthlist.h:28:35: warning: "CONFIG_SPEAKUP_DECEXT" is not defined
drivers/char/speakup/synthlist.h:31:35: warning: "CONFIG_SPEAKUP_DECTLK" is not defined
drivers/char/speakup/synthlist.h:34:33: warning: "CONFIG_SPEAKUP_DTLK" is not defined
drivers/char/speakup/synthlist.h:37:34: warning: "CONFIG_SPEAKUP_KEYPC" is not defined
drivers/char/speakup/synthlist.h:40:33: warning: "CONFIG_SPEAKUP_LTLK" is not defined
drivers/char/speakup/synthlist.h:43:35: warning: "CONFIG_SPEAKUP_SFTSYN" is not defined
drivers/char/speakup/synthlist.h:46:35: warning: "CONFIG_SPEAKUP_SPKOUT" is not defined
drivers/char/speakup/synthlist.h:49:34: warning: "CONFIG_SPEAKUP_TXPRT" is not defined
drivers/char/speakup/synthlist.h:13:35: warning: "CONFIG_SPEAKUP_ACNTPC" is not defined
drivers/char/speakup/synthlist.h:16:35: warning: "CONFIG_SPEAKUP_ACNTSA" is not defined
drivers/char/speakup/synthlist.h:19:35: warning: "CONFIG_SPEAKUP_APOLLO" is not defined
drivers/char/speakup/synthlist.h:22:35: warning: "CONFIG_SPEAKUP_AUDPTR" is not defined
drivers/char/speakup/synthlist.h:25:32: warning: "CONFIG_SPEAKUP_BNS" is not defined
drivers/char/speakup/synthlist.h:28:35: warning: "CONFIG_SPEAKUP_DECEXT" is not defined
drivers/char/speakup/synthlist.h:31:35: warning: "CONFIG_SPEAKUP_DECTLK" is not defined
drivers/char/speakup/synthlist.h:34:33: warning: "CONFIG_SPEAKUP_DTLK" is not defined
drivers/char/speakup/synthlist.h:37:34: warning: "CONFIG_SPEAKUP_KEYPC" is not defined
drivers/char/speakup/synthlist.h:40:33: warning: "CONFIG_SPEAKUP_LTLK" is not defined
drivers/char/speakup/synthlist.h:43:35: warning: "CONFIG_SPEAKUP_SFTSYN" is not defined
drivers/char/speakup/synthlist.h:46:35: warning: "CONFIG_SPEAKUP_SPKOUT" is not defined
drivers/char/speakup/synthlist.h:49:34: warning: "CONFIG_SPEAKUP_TXPRT" is not defined
drivers/char/speakup/synthlist.h:13:35: warning: "CONFIG_SPEAKUP_ACNTPC" is not defined
drivers/char/speakup/synthlist.h:16:35: warning: "CONFIG_SPEAKUP_ACNTSA" is not defined
drivers/char/speakup/synthlist.h:19:35: warning: "CONFIG_SPEAKUP_APOLLO" is not defined
drivers/char/speakup/synthlist.h:22:35: warning: "CONFIG_SPEAKUP_AUDPTR" is not defined
drivers/char/speakup/synthlist.h:25:32: warning: "CONFIG_SPEAKUP_BNS" is not defined
drivers/char/speakup/synthlist.h:28:35: warning: "CONFIG_SPEAKUP_DECEXT" is not defined
drivers/char/speakup/synthlist.h:31:35: warning: "CONFIG_SPEAKUP_DECTLK" is not defined
drivers/char/speakup/synthlist.h:34:33: warning: "CONFIG_SPEAKUP_DTLK" is not defined
drivers/char/speakup/synthlist.h:37:34: warning: "CONFIG_SPEAKUP_KEYPC" is not defined
drivers/char/speakup/synthlist.h:40:33: warning: "CONFIG_SPEAKUP_LTLK" is not defined
drivers/char/speakup/synthlist.h:43:35: warning: "CONFIG_SPEAKUP_SFTSYN" is not defined
drivers/char/speakup/synthlist.h:46:35: warning: "CONFIG_SPEAKUP_SPKOUT" is not defined
drivers/char/speakup/synthlist.h:49:34: warning: "CONFIG_SPEAKUP_TXPRT" is not defined
Signed-off-by: Nick Sillik <n.sillik@temple.edu>
[-- Attachment #2: speakup-wundef.patch --]
[-- Type: text/x-patch, Size: 571 bytes --]
diff -urN linux-2.6.13-rc6-mm2/drivers/char/speakup/synthlist.h linux-2.6.13-rc6-mm2-patched/drivers/char/speakup/synthlist.h
--- linux-2.6.13-rc6-mm2/drivers/char/speakup/synthlist.h 2005-08-23 15:51:31.000000000 -0400
+++ linux-2.6.13-rc6-mm2-patched/drivers/char/speakup/synthlist.h 2005-08-23 15:57:30.000000000 -0400
@@ -7,7 +7,7 @@
/* declare extern built in synths */
#define SYNTH_DECL(who) extern struct spk_synth synth_##who;
#define PASS2
-#define CFG_TEST(name) (name)
+#define CFG_TEST(name) defined(name)
#endif
#if CFG_TEST(CONFIG_SPEAKUP_ACNTPC)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [-mm PATCH] drivers/char/speakup/synthlist.h - Fix warnings with -Wundef
2005-08-23 20:00 [-mm PATCH] drivers/char/speakup/synthlist.h - Fix warnings with -Wundef Nick Sillik
@ 2005-08-24 5:37 ` Alexey Dobriyan
2005-08-24 5:38 ` Nick Sillik
0 siblings, 1 reply; 5+ messages in thread
From: Alexey Dobriyan @ 2005-08-24 5:37 UTC (permalink / raw)
To: Nick Sillik; +Cc: linux-kernel, Andrew Morton
On Tue, Aug 23, 2005 at 04:00:35PM -0400, Nick Sillik wrote:
> This patch fixes (it should) the following warnings generated with -Wundef
> in the file drivers/char/speakup/synthlist.h
>
> drivers/char/speakup/synthlist.h:13:35: warning: "CONFIG_SPEAKUP_ACNTPC" is
> not defined
> --- linux-2.6.13-rc6-mm2/drivers/char/speakup/synthlist.h
> +++ linux-2.6.13-rc6-mm2-patched/drivers/char/speakup/synthlist.h
> -#define CFG_TEST(name) (name)
> +#define CFG_TEST(name) defined(name)
No. Just remove this obfuscating macro.
> #endif
>
> #if CFG_TEST(CONFIG_SPEAKUP_ACNTPC)
^^^^^^^^^^^^
Yuck.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [-mm PATCH] drivers/char/speakup/synthlist.h - Fix warnings with -Wundef
2005-08-24 5:37 ` Alexey Dobriyan
@ 2005-08-24 5:38 ` Nick Sillik
2005-08-24 5:52 ` Nick Sillik
0 siblings, 1 reply; 5+ messages in thread
From: Nick Sillik @ 2005-08-24 5:38 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: linux-kernel, Andrew Morton
Alexey Dobriyan wrote:
>
>>-#define CFG_TEST(name) (name)
>>+#define CFG_TEST(name) defined(name)
>
>
> No. Just remove this obfuscating macro.
Agreed, here is the fixed patch
Signed-Off-By: Nick Sillik <n.sillik@temple.edu>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [-mm PATCH] drivers/char/speakup/synthlist.h - Fix warnings with -Wundef
2005-08-24 5:38 ` Nick Sillik
@ 2005-08-24 5:52 ` Nick Sillik
2005-08-24 18:04 ` Alexey Dobriyan
0 siblings, 1 reply; 5+ messages in thread
From: Nick Sillik @ 2005-08-24 5:52 UTC (permalink / raw)
To: Nick Sillik; +Cc: Alexey Dobriyan, linux-kernel, Andrew Morton
[-- Attachment #1: Type: text/plain, Size: 358 bytes --]
Nick Sillik wrote:
> Alexey Dobriyan wrote:
>
>>
>>> -#define CFG_TEST(name) (name)
>>> +#define CFG_TEST(name) defined(name)
>>
>>
>>
>> No. Just remove this obfuscating macro.
>
>
> Agreed, here is the fixed patch
>
> Signed-Off-By: Nick Sillik <n.sillik@temple.edu>
No here it really is... (sorry)
Signed-Off-By: Nick Sillik <n.sillik@temple.edu>
[-- Attachment #2: speakup-wundef.patch --]
[-- Type: text/x-patch, Size: 1929 bytes --]
diff -urN -X linux-2.6.13-rc6-mm2/Documentation/dontdiff linux-2.6.13-rc6-mm2/drivers/char/speakup/synthlist.h linux-2.6.13-rc6-mm2-patched/drivers/char/speakup/synthlist.h
--- linux-2.6.13-rc6-mm2/drivers/char/speakup/synthlist.h 2005-08-24 01:37:59.000000000 -0400
+++ linux-2.6.13-rc6-mm2-patched/drivers/char/speakup/synthlist.h 2005-08-24 01:37:37.000000000 -0400
@@ -2,53 +2,51 @@
#if defined(PASS2)
/* table of built in synths */
#define SYNTH_DECL(who) &synth_##who,
-#define CFG_TEST(name) (name)
#else
/* declare extern built in synths */
#define SYNTH_DECL(who) extern struct spk_synth synth_##who;
#define PASS2
-#define CFG_TEST(name) (name)
#endif
-#if CFG_TEST(CONFIG_SPEAKUP_ACNTPC)
+#ifdef CONFIG_SPEAKUP_ACNTPC
SYNTH_DECL(acntpc)
#endif
-#if CFG_TEST(CONFIG_SPEAKUP_ACNTSA)
+#ifdef CONFIG_SPEAKUP_ACNTSA
SYNTH_DECL(acntsa)
#endif
-#if CFG_TEST(CONFIG_SPEAKUP_APOLLO)
+#ifdef CONFIG_SPEAKUP_APOLLO
SYNTH_DECL(apollo)
#endif
-#if CFG_TEST(CONFIG_SPEAKUP_AUDPTR)
+#ifdef CONFIG_SPEAKUP_AUDPTR
SYNTH_DECL(audptr)
#endif
-#if CFG_TEST(CONFIG_SPEAKUP_BNS)
+#ifdef CONFIG_SPEAKUP_BNS
SYNTH_DECL(bns)
#endif
-#if CFG_TEST(CONFIG_SPEAKUP_DECEXT)
+#ifdef CONFIG_SPEAKUP_DECEXT
SYNTH_DECL(decext)
#endif
-#if CFG_TEST(CONFIG_SPEAKUP_DECTLK)
+#ifdef CONFIG_SPEAKUP_DECTLK
SYNTH_DECL(dectlk)
#endif
-#if CFG_TEST(CONFIG_SPEAKUP_DTLK)
+#ifdef CONFIG_SPEAKUP_DTLK
SYNTH_DECL(dtlk)
#endif
-#if CFG_TEST(CONFIG_SPEAKUP_KEYPC)
+#ifdef CONFIG_SPEAKUP_KEYPC
SYNTH_DECL(keypc)
#endif
-#if CFG_TEST(CONFIG_SPEAKUP_LTLK)
+#ifdef CONFIG_SPEAKUP_LTLK
SYNTH_DECL(ltlk)
#endif
-#if CFG_TEST(CONFIG_SPEAKUP_SFTSYN)
+#ifdef CONFIG_SPEAKUP_SFTSYN
SYNTH_DECL(sftsyn)
#endif
-#if CFG_TEST(CONFIG_SPEAKUP_SPKOUT)
+#ifdef CONFIG_SPEAKUP_SPKOUT
SYNTH_DECL(spkout)
#endif
-#if CFG_TEST(CONFIG_SPEAKUP_TXPRT)
+#ifdef CONFIG_SPEAKUP_TXPRT
SYNTH_DECL(txprt)
#endif
#undef SYNTH_DECL
-#undef CFG_TEST
+#undef
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2005-08-24 17:55 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-08-23 20:00 [-mm PATCH] drivers/char/speakup/synthlist.h - Fix warnings with -Wundef Nick Sillik
2005-08-24 5:37 ` Alexey Dobriyan
2005-08-24 5:38 ` Nick Sillik
2005-08-24 5:52 ` Nick Sillik
2005-08-24 18:04 ` Alexey Dobriyan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox