* 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15112 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

10 files changed, 38 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index e8d3a0919e..b1a68503d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Fri Jan 18 17:56:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* thread.c (thread_cleanup_func): ignore errors from destroying mutex
diff --git a/eval_intern.h b/eval_intern.h
index 884d7c42a0..4436fcc32d 100644
--- a/eval_intern.h
+++ b/eval_intern.h
@@ -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 @@ VALUE rb_vm_top_self();
 
 #define ruby_cbase() vm_get_cbase(GET_THREAD())
 
-#endif /* EVAL_INTERN_H_INCLUDED */
+#endif /* RUBY_EVAL_INTERN_H */
diff --git a/id.h b/id.h
index 3ea63db70d..15654b2be3 100644
--- a/id.h
+++ b/id.h
@@ -9,6 +9,9 @@
 
 **********************************************************************/
 
+#ifndef RUBY_ID_H
+#define RUBY_ID_H
+
 extern VALUE symIFUNC;
 extern VALUE symCFUNC;
 
@@ -48,4 +51,4 @@ extern ID idAnswer;
 extern ID idSend;
 extern ID id__send__;
 
-
+#endif /* RUBY_ID_H */
diff --git a/insnhelper.h b/insnhelper.h
index 9e18f13437..a862f2672e 100644
--- a/insnhelper.h
+++ b/insnhelper.h
@@ -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 */
diff --git a/regenc.h b/regenc.h
index c7026fb40e..09c6da4783 100644
--- a/regenc.h
+++ b/regenc.h
@@ -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 @@ extern int ONIG_ENC_REGISTER(const char *, OnigEncodingType*);
 #define ENC_ALIAS(name, orig)
 #define ENC_DUMMY(name)
 
-#endif /* REGENC_H */
+#endif /* ONIGURUMA_REGENC_H */
diff --git a/regint.h b/regint.h
index 58b3b4ab9a..c88010381a 100644
--- a/regint.h
+++ b/regint.h
@@ -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 @@ typedef int (*ONIGENC_INIT_PROPERTY_LIST_FUNC_TYPE)(void);
 
 extern int onigenc_property_list_init P_((ONIGENC_INIT_PROPERTY_LIST_FUNC_TYPE));
 
-#endif /* REGINT_H */
+#endif /* ONIGURUMA_REGINT_H */
diff --git a/regparse.h b/regparse.h
index 0c5c2c936c..26ebb117e4 100644
--- a/regparse.h
+++ b/regparse.h
@@ -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 @@ extern int onig_print_names(FILE*, regex_t*);
 #endif
 #endif
 
-#endif /* REGPARSE_H */
+#endif /* ONIGURUMA_REGPARSE_H */
diff --git a/thread_pthread.h b/thread_pthread.h
index f97ed59582..04254d7312 100644
--- a/thread_pthread.h
+++ b/thread_pthread.h
@@ -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 @@ typedef struct native_thread_data_struct {
     pthread_cond_t sleep_cond;
 } native_thread_data_t;
 
-#endif /* THREAD_PTHREAD_H_INCLUDED */
+#endif /* RUBY_THREAD_PTHREAD_H */
diff --git a/vm_core.h b/vm_core.h
index ae1b08c2ae..551e87a48a 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -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 @@ exec_event_hooks(rb_event_hook_t *hook, rb_event_flag_t flag, VALUE self, ID id,
     } \
 } while (0)
 
-#endif /* RUBY_CORE_H */
+#endif /* RUBY_VM_CORE_H */
diff --git a/vm_opts.h b/vm_opts.h
index 5f607e7aab..5ccf1f1052 100644
--- a/vm_opts.h
+++ b/vm_opts.h
@@ -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 */