Kouhei Sutou
kous****@users*****
2006年 11月 28日 (火) 13:26:23 JST
Index: tomoe/ext/ruby/Makefile.am diff -u tomoe/ext/ruby/Makefile.am:1.9 tomoe/ext/ruby/Makefile.am:1.10 --- tomoe/ext/ruby/Makefile.am:1.9 Tue Nov 28 13:14:10 2006 +++ tomoe/ext/ruby/Makefile.am Tue Nov 28 13:26:23 2006 @@ -7,6 +7,7 @@ $(rubylib_DATA) rubyarchdir = $(RUBY_EXTDIR) +rubyarch_HEADERS = rbtomoe.h rubyarch_LTLIBRARIES = tomoe.la AM_CPPFLAGS = \ Index: tomoe/ext/ruby/rbtomoe.h diff -u /dev/null tomoe/ext/ruby/rbtomoe.h:1.1 --- /dev/null Tue Nov 28 13:26:23 2006 +++ tomoe/ext/ruby/rbtomoe.h Tue Nov 28 13:26:23 2006 @@ -0,0 +1,28 @@ +/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */ + +#ifndef __RBTOMOE_H__ +#define __RBTOMOE_H__ + +#include <tomoe.h> + +#include <ruby.h> +#include <rbgobject.h> + +G_BEGIN_DECLS + +#define RVAL2TCTX(obj) (TOMOE_CONTEXT(RVAL2GOBJ(obj))) +#define RVAL2TDIC(obj) (TOMOE_DICT(RVAL2GOBJ(obj))) +#define RVAL2TWTG(obj) (TOMOE_WRITING(RVAL2GOBJ(obj))) +#define RVAL2TQRY(obj) (TOMOE_QUERY(RVAL2GOBJ(obj))) +#define RVAL2TRDG(obj) (TOMOE_READING(RVAL2GOBJ(obj))) +#define RVAL2TCHR(obj) (TOMOE_CHAR(RVAL2GOBJ(obj))) + +#define RVAL2TRT(obj) (RVAL2GENUM(obj, TOMOE_TYPE_READING_TYPE)) + +G_END_DECLS + +#endif /* __RBTOMOE_H__ */ + +/* +vi:expandtab +*/ Index: tomoe/ext/ruby/tomoe-rb.h diff -u tomoe/ext/ruby/tomoe-rb.h:1.7 tomoe/ext/ruby/tomoe-rb.h:1.8 --- tomoe/ext/ruby/tomoe-rb.h:1.7 Tue Nov 28 12:19:00 2006 +++ tomoe/ext/ruby/tomoe-rb.h Tue Nov 28 13:26:23 2006 @@ -17,28 +17,16 @@ * Free Software Foundation, Inc., 59 Temple Place, Suite 330, * Boston, MA 02111-1307 USA * - * $Id: tomoe-rb.h,v 1.7 2006/11/28 03:19:00 kous Exp $ + * $Id: tomoe-rb.h,v 1.8 2006/11/28 04:26:23 kous Exp $ */ #ifndef __TOMOE_RB_H__ #define __TOMOE_RB_H__ -#include <tomoe.h> - -#include <ruby.h> -#include <rbgobject.h> +#include "rbtomoe.h" G_BEGIN_DECLS -#define RVAL2TCTX(obj) (TOMOE_CONTEXT(RVAL2GOBJ(obj))) -#define RVAL2TDIC(obj) (TOMOE_DICT(RVAL2GOBJ(obj))) -#define RVAL2TWTG(obj) (TOMOE_WRITING(RVAL2GOBJ(obj))) -#define RVAL2TQRY(obj) (TOMOE_QUERY(RVAL2GOBJ(obj))) -#define RVAL2TRDG(obj) (TOMOE_READING(RVAL2GOBJ(obj))) -#define RVAL2TCHR(obj) (TOMOE_CHAR(RVAL2GOBJ(obj))) - -#define RVAL2TRT(obj) (RVAL2GENUM(obj, TOMOE_TYPE_READING_TYPE)) - void Init_tomoe(void); void Init_tomoe_candidate(VALUE mTomoe); void Init_tomoe_char(VALUE mTomoe); @@ -50,6 +38,8 @@ void Init_tomoe_recognizer(VALUE mTomoe); void Init_tomoe_writing(VALUE mTomoe); +G_END_DECLS + #endif /* __TOMOE_RB_H__ */ /*
