aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-13 22:35:29 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-13 22:35:29 +0000
commitbc2abdcac445500a902700d511ed10f7fffcc40b (patch)
tree76611f59b10fa075f315ea6afdace61877836371
parent63ca916ed414649e294b8dab1a30872c865a9faf (diff)
downloadruby-bc2abdcac445500a902700d511ed10f7fffcc40b.tar.gz
* ext/curses/curses.c: parenthesize macro arguments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30864 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/curses/curses.c8
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 2825ab6b3b..dbc06ae4cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb 14 07:34:55 2011 Tanaka Akira <akr@fsij.org>
+
+ * ext/curses/curses.c: parenthesize macro arguments.
+
Sun Feb 13 19:41:47 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/test/unit.rb (Test::Unit::RequireFiles#non_options): skip
diff --git a/ext/curses/curses.c b/ext/curses/curses.c
index 2020f3e1b1..5d8f2c535a 100644
--- a/ext/curses/curses.c
+++ b/ext/curses/curses.c
@@ -83,8 +83,8 @@ no_window(void)
#define GetWINDOW(obj, winp) do {\
if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)\
rb_raise(rb_eSecurityError, "Insecure: operation on untainted window");\
- Data_Get_Struct(obj, struct windata, winp);\
- if (winp->window == 0) no_window();\
+ Data_Get_Struct((obj), struct windata, (winp));\
+ if ((winp)->window == 0) no_window();\
} while (0)
static void
@@ -784,8 +784,8 @@ no_mevent(void)
#define GetMOUSE(obj, data) do {\
if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)\
rb_raise(rb_eSecurityError, "Insecure: operation on untainted mouse");\
- Data_Get_Struct(obj, struct mousedata, data);\
- if (data->mevent == 0) no_mevent();\
+ Data_Get_Struct((obj), struct mousedata, (data));\
+ if ((data)->mevent == 0) no_mevent();\
} while (0)
static void