[前][次][番号順一覧][スレッド一覧]

ruby-changes:16768

From: nobu <ko1@a...>
Date: Tue, 27 Jul 2010 18:34:16 +0900 (JST)
Subject: [ruby-changes:16768] Ruby:r28764 (trunk, ruby_1_8): * defines.h, intern.h, missing.h, ruby.h, st.h, util.h: include

nobu	2010-07-27 18:33:55 +0900 (Tue, 27 Jul 2010)

  New Revision: 28764

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28764

  Log:
    * defines.h, intern.h, missing.h, ruby.h, st.h, util.h: include
      config.h and defines.h for autoconf macros.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/defines.h
    branches/ruby_1_8/intern.h
    branches/ruby_1_8/missing.h
    branches/ruby_1_8/st.h
    branches/ruby_1_8/util.h
    branches/ruby_1_8/version.h
    trunk/ChangeLog
    trunk/include/ruby/defines.h
    trunk/include/ruby/intern.h
    trunk/include/ruby/missing.h
    trunk/include/ruby/ruby.h
    trunk/include/ruby/st.h
    trunk/include/ruby/util.h

Index: include/ruby/missing.h
===================================================================
--- include/ruby/missing.h	(revision 28763)
+++ include/ruby/missing.h	(revision 28764)
@@ -18,6 +18,11 @@
 #endif
 #endif
 
+#include "ruby/config.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
+
 #if defined(HAVE_SYS_TIME_H)
 #  include <sys/time.h>
 #elif !defined(_WIN32)
Index: include/ruby/defines.h
===================================================================
--- include/ruby/defines.h	(revision 28763)
+++ include/ruby/defines.h	(revision 28764)
@@ -17,6 +17,11 @@
 #endif
 #endif
 
+#include "ruby/config.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
+
 #define RUBY
 
 #include <stdlib.h>
Index: include/ruby/util.h
===================================================================
--- include/ruby/util.h	(revision 28763)
+++ include/ruby/util.h	(revision 28764)
@@ -19,6 +19,11 @@
 #endif
 #endif
 
+#include "ruby/defines.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
+
 #ifndef _
 #ifdef __cplusplus
 # ifndef  HAVE_PROTOTYPES
Index: include/ruby/intern.h
===================================================================
--- include/ruby/intern.h	(revision 28763)
+++ include/ruby/intern.h	(revision 28764)
@@ -21,6 +21,11 @@
 #endif
 #endif
 
+#include "ruby/defines.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
+
 #ifdef HAVE_STDARG_PROTOTYPES
 # include <stdarg.h>
 #else
Index: include/ruby/ruby.h
===================================================================
--- include/ruby/ruby.h	(revision 28763)
+++ include/ruby/ruby.h	(revision 28764)
@@ -21,12 +21,10 @@
 #endif
 #endif
 
-#ifndef RUBY_LIB_PREFIX
 #include "ruby/config.h"
 #ifdef RUBY_EXTCONF_H
 #include RUBY_EXTCONF_H
 #endif
-#endif
 
 #define NORETURN_STYLE_NEW 1
 #ifndef NORETURN
Index: include/ruby/st.h
===================================================================
--- include/ruby/st.h	(revision 28763)
+++ include/ruby/st.h	(revision 28764)
@@ -12,13 +12,7 @@
 #endif
 #endif
 
-#ifndef RUBY_LIB_PREFIX
-#include "ruby/config.h"
 #include "ruby/defines.h"
-#ifdef RUBY_EXTCONF_H
-#include RUBY_EXTCONF_H
-#endif
-#endif
 
 #if   defined STDC_HEADERS
 #include <stddef.h>
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28763)
+++ ChangeLog	(revision 28764)
@@ -1,3 +1,8 @@
+Tue Jul 27 18:33:42 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* defines.h, intern.h, missing.h, ruby.h, st.h, util.h: include
+	  config.h and defines.h for autoconf macros.
+
 Tue Jul 27 16:27:38 2010  NAKAMURA Usaku  <usa@r...>
 
 	* numeric.c (flo_cmp): typo.
Index: ruby_1_8/intern.h
===================================================================
--- ruby_1_8/intern.h	(revision 28763)
+++ ruby_1_8/intern.h	(revision 28764)
@@ -11,7 +11,14 @@
   Copyright (C) 2000  Information-technology Promotion Agency, Japan
 
 **********************************************************************/
+#ifndef INTERN_H
+#define INTERN_H
 
+#include "defines.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
+
 /*
  * Functions and variables that are used by more than one source file of
  * the kernel.
@@ -538,3 +545,5 @@
 /* version.c */
 void ruby_show_version _((void));
 void ruby_show_copyright _((void));
+
+#endif
Index: ruby_1_8/util.h
===================================================================
--- ruby_1_8/util.h	(revision 28763)
+++ ruby_1_8/util.h	(revision 28764)
@@ -13,6 +13,11 @@
 #ifndef UTIL_H
 #define UTIL_H
 
+#include "defines.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
+
 #ifndef _
 #ifdef __cplusplus
 # ifndef  HAVE_PROTOTYPES
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 28763)
+++ ruby_1_8/ChangeLog	(revision 28764)
@@ -1,3 +1,8 @@
+Tue Jul 27 18:33:42 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* defines.h, intern.h, missing.h, ruby.h, st.h, util.h: include
+	  config.h and defines.h for autoconf macros.
+
 Mon Jul 26 18:18:09 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (config.h): add include guard.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 28763)
+++ ruby_1_8/version.h	(revision 28764)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2010-07-26"
+#define RUBY_RELEASE_DATE "2010-07-27"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20100726
+#define RUBY_RELEASE_CODE 20100727
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 26
+#define RUBY_RELEASE_DAY 27
 
 #define NO_STRING_LITERAL_CONCATENATION 1
 #ifdef RUBY_EXTERN
Index: ruby_1_8/missing.h
===================================================================
--- ruby_1_8/missing.h	(revision 28763)
+++ ruby_1_8/missing.h	(revision 28764)
@@ -12,6 +12,11 @@
 #ifndef MISSING_H
 #define MISSING_H
 
+#include "config.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
+
 #if defined(HAVE_SYS_TIME_H)
 #  include <sys/time.h>
 #elif !defined(_WIN32)
Index: ruby_1_8/defines.h
===================================================================
--- ruby_1_8/defines.h	(revision 28763)
+++ ruby_1_8/defines.h	(revision 28764)
@@ -10,6 +10,11 @@
 #ifndef DEFINES_H
 #define DEFINES_H
 
+#include "config.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
+
 #define RUBY
 
 #ifdef __cplusplus
Index: ruby_1_8/st.h
===================================================================
--- ruby_1_8/st.h	(revision 28763)
+++ ruby_1_8/st.h	(revision 28764)
@@ -6,6 +6,11 @@
 
 #define ST_INCLUDED
 
+#include "defines.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
+
 #if SIZEOF_LONG == SIZEOF_VOIDP
 typedef unsigned long st_data_t;
 #elif SIZEOF_LONG_LONG == SIZEOF_VOIDP

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]