mailing list of musl libc
 help / color / mirror / code / Atom feed
From: Isaac Dunham <idunham@lavabit.com>
To: musl@lists.openwall.com
Subject: [PATCH] _BSD_SOURCE in math.h; MAXFLOAT is XOPEN only
Date: Thu, 5 Apr 2012 22:32:27 -0700	[thread overview]
Message-ID: <20120405223227.4d1ecb2b@newbook> (raw)

[-- Attachment #1: Type: text/plain, Size: 479 bytes --]

This is pretty minor for the most part.
There was one issue I noticed: 
_GNU_SOURCE defines MAXFLOAT here, but glibc only defines it if
_USE_SVID is not defined (I'm not copy-pasting here, I cleaned it
up):
#ifdef _USE_SVID //defined as 1 if _GNU_SOURCE is
..
# define HUGE //Same value as MAXFLOAT
#else
#ifdef _XOPEN_SOURCE
# define MAXFLOAT //ifndef _USE_SVID 
#endif
#endif //SVID

So I moved it so _GNU_SOURCE doesn't add it, and I
added HUGE to _GNU_SOURCE...

Isaac Dunham

[-- Attachment #2: math.diff --]
[-- Type: text/x-patch, Size: 1252 bytes --]

diff --git a/include/math.h b/include/math.h
index ff62cb7..85ef634 100644
--- a/include/math.h
+++ b/include/math.h
@@ -330,8 +330,7 @@ double      trunc(double);
 float       truncf(float);
 long double truncl(long double);
 
-#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
-#define MAXFLOAT        3.40282347e+38F
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 #define M_E             2.7182818284590452354   /* e */
 #define M_LOG2E         1.4426950408889634074   /* log_2 e */
 #define M_LOG10E        0.43429448190325182765  /* log_10 e */
@@ -345,7 +344,13 @@ long double truncl(long double);
 #define M_2_SQRTPI      1.12837916709551257390  /* 2/sqrt(pi) */
 #define M_SQRT2         1.41421356237309504880  /* sqrt(2) */
 #define M_SQRT1_2       0.70710678118654752440  /* 1/sqrt(2) */
+#endif
 
+#if defined(_XOPEN_SOURCE)
+#define MAXFLOAT        3.40282347e+38F
+#endif
+
+#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
 extern int signgam;
 
 double      j0(double);
@@ -358,6 +363,7 @@ double      yn(int, double);
 #endif
 
 #ifdef _GNU_SOURCE
+#define HUGE        3.40282347e+38F
 double      scalb(double, double);
 float       scalbf(float, float);
 long double scalbl(long double, long double);

             reply	other threads:[~2012-04-06  5:32 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-06  5:32 Isaac Dunham [this message]
2012-04-06 13:14 ` Rich Felker
2012-04-06 15:26   ` Isaac Dunham

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120405223227.4d1ecb2b@newbook \
    --to=idunham@lavabit.com \
    --cc=musl@lists.openwall.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/musl/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).