ruby-changes:3623
From: ko1@a...
Date: Fri, 18 Jan 2008 17:57:47 +0900 (JST)
Subject: [ruby-changes:3623] nobu - Ruby:r15112 (trunk): * eval_intern.h, insnhelper.h, thread_pthread.h, vm_core.h, vm_opts.h:
nobu 2008-01-18 17:56:11 +0900 (Fri, 18 Jan 2008)
New Revision: 15112
Modified files:
trunk/ChangeLog
trunk/eval_intern.h
trunk/id.h
trunk/insnhelper.h
trunk/regenc.h
trunk/regint.h
trunk/regparse.h
trunk/thread_pthread.h
trunk/vm_core.h
trunk/vm_opts.h
Log:
* eval_intern.h, insnhelper.h, thread_pthread.h, vm_core.h, vm_opts.h:
prefixed include guards with RUBY.
* id.h: added include guard.
* regenc.h, regint.h, regparse.h: prefixed include guards with
ONIGURUMA.
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/vm_opts.h?r1=15112&r2=15111&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/regparse.h?r1=15112&r2=15111&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15112&r2=15111&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/thread_pthread.h?r1=15112&r2=15111&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/regint.h?r1=15112&r2=15111&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/vm_core.h?r1=15112&r2=15111&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/insnhelper.h?r1=15112&r2=15111&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/regenc.h?r1=15112&r2=15111&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/id.h?r1=15112&r2=15111&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/eval_intern.h?r1=15112&r2=15111&diff_format=u
Index: eval_intern.h
===================================================================
--- eval_intern.h (revision 15111)
+++ eval_intern.h (revision 15112)
@@ -1,6 +1,6 @@
-#ifndef EVAL_INTERN_H_INCLUDED
-#define EVAL_INTERN_H_INCLUDED
+#ifndef RUBY_EVAL_INTERN_H
+#define RUBY_EVAL_INTERN_H
#define PASS_PASSED_BLOCK() \
(GET_THREAD()->passed_block = \
@@ -243,4 +243,4 @@
#define ruby_cbase() vm_get_cbase(GET_THREAD())
-#endif /* EVAL_INTERN_H_INCLUDED */
+#endif /* RUBY_EVAL_INTERN_H */
Index: regparse.h
===================================================================
--- regparse.h (revision 15111)
+++ regparse.h (revision 15112)
@@ -1,5 +1,5 @@
-#ifndef REGPARSE_H
-#define REGPARSE_H
+#ifndef ONIGURUMA_REGPARSE_H
+#define ONIGURUMA_REGPARSE_H
/**********************************************************************
regparse.h - Oniguruma (regular expression library)
**********************************************************************/
@@ -348,4 +348,4 @@
#endif
#endif
-#endif /* REGPARSE_H */
+#endif /* ONIGURUMA_REGPARSE_H */
Index: ChangeLog
===================================================================
--- ChangeLog (revision 15111)
+++ ChangeLog (revision 15112)
@@ -1,3 +1,13 @@
+Fri Jan 18 17:56:09 2008 Nobuyoshi Nakada <nobu@r...>
+
+ * eval_intern.h, insnhelper.h, thread_pthread.h, vm_core.h, vm_opts.h:
+ prefixed include guards with RUBY.
+
+ * id.h: added include guard.
+
+ * regenc.h, regint.h, regparse.h: prefixed include guards with
+ ONIGURUMA.
+
Fri Jan 18 15:57:05 2008 Nobuyoshi Nakada <nobu@r...>
* thread.c (thread_cleanup_func): ignore errors from destroying mutex
Index: regenc.h
===================================================================
--- regenc.h (revision 15111)
+++ regenc.h (revision 15112)
@@ -1,5 +1,5 @@
-#ifndef REGENC_H
-#define REGENC_H
+#ifndef ONIGURUMA_REGENC_H
+#define ONIGURUMA_REGENC_H
/**********************************************************************
regenc.h - Oniguruma (regular expression library)
**********************************************************************/
@@ -204,4 +204,4 @@
#define ENC_ALIAS(name, orig)
#define ENC_DUMMY(name)
-#endif /* REGENC_H */
+#endif /* ONIGURUMA_REGENC_H */
Index: thread_pthread.h
===================================================================
--- thread_pthread.h (revision 15111)
+++ thread_pthread.h (revision 15112)
@@ -8,8 +8,8 @@
**********************************************************************/
-#ifndef THREAD_PTHREAD_H_INCLUDED
-#define THREAD_PTHREAD_H_INCLUDED
+#ifndef RUBY_THREAD_PTHREAD_H
+#define RUBY_THREAD_PTHREAD_H
#include <pthread.h>
typedef pthread_t rb_thread_id_t;
@@ -21,4 +21,4 @@
pthread_cond_t sleep_cond;
} native_thread_data_t;
-#endif /* THREAD_PTHREAD_H_INCLUDED */
+#endif /* RUBY_THREAD_PTHREAD_H */
Index: vm_core.h
===================================================================
--- vm_core.h (revision 15111)
+++ vm_core.h (revision 15112)
@@ -9,8 +9,8 @@
**********************************************************************/
-#ifndef RUBY_CORE_H
-#define RUBY_CORE_H
+#ifndef RUBY_VM_CORE_H
+#define RUBY_VM_CORE_H
#define RUBY_VM_THREAD_MODEL 2
@@ -677,4 +677,4 @@
} \
} while (0)
-#endif /* RUBY_CORE_H */
+#endif /* RUBY_VM_CORE_H */
Index: insnhelper.h
===================================================================
--- insnhelper.h (revision 15111)
+++ insnhelper.h (revision 15112)
@@ -9,8 +9,8 @@
**********************************************************************/
-#ifndef _INSNHELPER_H_INCLUDED_
-#define _INSNHELPER_H_INCLUDED_
+#ifndef RUBY_INSNHELPER_H
+#define RUBY_INSNHELPER_H
#include "ruby/ruby.h"
#include "ruby/node.h"
@@ -145,4 +145,4 @@
CALL_METHOD(num, 0, 0, id, rb_method_node(klass, id), recv, CLASS_OF(recv)); \
} while (0)
-#endif /* _INSNHELPER_H_INCLUDED_ */
+#endif /* RUBY_INSNHELPER_H */
Index: regint.h
===================================================================
--- regint.h (revision 15111)
+++ regint.h (revision 15112)
@@ -1,5 +1,5 @@
-#ifndef REGINT_H
-#define REGINT_H
+#ifndef ONIGURUMA_REGINT_H
+#define ONIGURUMA_REGINT_H
/**********************************************************************
regint.h - Oniguruma (regular expression library)
**********************************************************************/
@@ -841,4 +841,4 @@
extern int onigenc_property_list_init P_((ONIGENC_INIT_PROPERTY_LIST_FUNC_TYPE));
-#endif /* REGINT_H */
+#endif /* ONIGURUMA_REGINT_H */
Index: id.h
===================================================================
--- id.h (revision 15111)
+++ id.h (revision 15112)
@@ -9,6 +9,9 @@
**********************************************************************/
+#ifndef RUBY_ID_H
+#define RUBY_ID_H
+
extern VALUE symIFUNC;
extern VALUE symCFUNC;
@@ -48,4 +51,4 @@
extern ID idSend;
extern ID id__send__;
-
+#endif /* RUBY_ID_H */
Index: vm_opts.h
===================================================================
--- vm_opts.h (revision 15111)
+++ vm_opts.h (revision 15112)
@@ -10,8 +10,8 @@
**********************************************************************/
-#ifndef VM_OPTS_H_INCLUDED
-#define VM_OPTS_H_INCLUDED
+#ifndef RUBY_VM_OPTS_H
+#define RUBY_VM_OPTS_H
/* Compile options.
* You can change these options at runtime by VM::CompileOption.
@@ -47,5 +47,4 @@
/* misc */
#define SUPPORT_JOKE 0
-#endif /* VM_OPTS_H_INCLUDED */
-
+#endif /* RUBY_VM_OPTS_H */
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/