summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-04 11:31:37 (GMT)
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-04 11:31:37 (GMT)
commit0031967d2012896b7e86548a661cd0e1b3b52fa5 (patch)
treefdd0d26ee8273a523379197d35846f1a2787cf9d
parentb53f7a1cbf5ddac058163eea9d1c34b93a474601 (diff)
* transcode_data.h (PType): defined unconditionaly.
* transcode.c (PType): don't define here. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19127 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--transcode.c1
-rw-r--r--transcode_data.h3
3 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index a6ce145..d82554b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Sep 4 20:30:24 2008 Tanaka Akira <akr@fsij.org>
+
+ * transcode_data.h (PType): defined unconditionaly.
+
+ * transcode.c (PType): don't define here.
+
Thu Sep 4 20:19:36 2008 Tanaka Akira <akr@fsij.org>
* io.c: variables renamed for consistency.
diff --git a/transcode.c b/transcode.c
index 746892b..a0eede4 100644
--- a/transcode.c
+++ b/transcode.c
@@ -11,7 +11,6 @@
#include "ruby/ruby.h"
#include "ruby/encoding.h"
-#define PType (int)
#include "transcode_data.h"
#include <ctype.h>
diff --git a/transcode_data.h b/transcode_data.h
index bf1b6df..ee30fe7 100644
--- a/transcode_data.h
+++ b/transcode_data.h
@@ -20,10 +20,7 @@
#define BYTE_LOOKUP_BASE(bl) ((bl)[0])
#define BYTE_LOOKUP_INFO(bl) ((bl)[1])
-#ifndef PType
-/* data file needs to treat this as a pointer, to remove warnings */
#define PType (unsigned int)
-#endif
#define NOMAP (PType 0x01) /* single byte direct map */
#define ONEbt (0x02) /* one byte payload */