Project

General

Profile

Actions

Bug #11483

closed

internal.h included after math.h in complex.c

Added by ReiOdaira (Rei Odaira) over 8 years ago. Updated over 8 years ago.

Status:
Closed
Assignee:
-
Target version:
-
ruby -v:
ruby 2.3.0dev (2015-08-23 trunk 51669) [powerpc-aix7.1.2.0]
[ruby-core:<unknown>]

Description

r51313 modified complex.c to include internal.h after math.h, so that ruby/missing.h (included from internal.h) can test whether M_PI is defined or not in math.h. Unfortunately, ruby/config.h, which is included from internal.h, defines _LARGE_FILES, which must be defined before sys/types.h is included from math.h. Otherwise, in AIX, off_t would be incorrectly defined as a 32-bit integer even when large files are used.

--- complex.c   (revision 51312)
+++ complex.c   (revision 51313)
@@ -5,12 +5,12 @@
   which is written in ruby.
 */
 
-#include "internal.h"
 #if defined _MSC_VER
 /* Microsoft Visual C does not define M_PI and others by default */
 # define _USE_MATH_DEFINES 1
 #endif
 #include <math.h>
+#include "internal.h"
 
 #define NDEBUG
 #include <assert.h>

There would be a couple of workarounds to fix this problem, but since I am relatively new to the Ruby core, I am wondering what would be the most acceptable way.


Related issues 1 (0 open1 closed)

Blocks Ruby master - Misc #11516: Ruby 2.3.0 release engeneeringClosednaruse (Yui NARUSE)Actions
Actions

Also available in: Atom PDF

Like0
Like0Like0Like0