Browse Source

Rename _scan_nan() to __scan_nan().

The current tradition of openlibm is to hide all of its internal symbols
into the reserved system namespace. CloudABI has a check in place to
ensure that its C library (which contains openlibm) to not place any
unwanted symbols into the public namespace. openlibm seems to leak
_scan_nan() in there, so we'd better add an additional underscore.
Ed Schouten 9 years ago
parent
commit
78c0afb2a7
5 changed files with 7 additions and 7 deletions
  1. 1 1
      ld128/s_nanl.c
  2. 1 1
      ld80/s_nanl.c
  3. 1 1
      src/math_private.h
  4. 1 1
      src/math_private_openbsd.h
  5. 3 3
      src/s_nan.c

+ 1 - 1
ld128/s_nanl.c

@@ -39,7 +39,7 @@ nanl(const char *s)
 		uint32_t bits[4];
 	} u;
 
-	_scan_nan(u.bits, 4, s);
+	__scan_nan(u.bits, 4, s);
 	u.ieee.bits.exp = 0x7fff;
 	u.ieee.bits.manh |= 1ULL << 47;	/* make it a quiet NaN */
 	return (u.ieee.e);

+ 1 - 1
ld80/s_nanl.c

@@ -38,7 +38,7 @@ nanl(const char *s)
 		uint32_t bits[3];
 	} u;
 
-	_scan_nan(u.bits, 3, s);
+	__scan_nan(u.bits, 3, s);
 	u.ieee.bits.exp = 0x7fff;
 	u.ieee.bits.manh |= 0xc0000000;	/* make it a quiet NaN */
 	return (u.ieee.e);

+ 1 - 1
src/math_private.h

@@ -229,7 +229,7 @@ do {								\
 /*
  * Common routine to process the arguments to nan(), nanf(), and nanl().
  */
-void _scan_nan(u_int32_t *__words, int __num_words, const char *__s);
+void __scan_nan(u_int32_t *__words, int __num_words, const char *__s);
 
 #ifdef __GNUCLIKE_ASM
 

+ 1 - 1
src/math_private_openbsd.h

@@ -205,7 +205,7 @@ do {								\
 /*
  * Common routine to process the arguments to nan(), nanf(), and nanl().
  */
-void _scan_nan(uint32_t *__words, int __num_words, const char *__s);
+void __scan_nan(uint32_t *__words, int __num_words, const char *__s);
 
 /*
  * Functions internal to the math package, yet not static.

+ 3 - 3
src/s_nan.c

@@ -62,7 +62,7 @@ static __inline int digittoint(int c) {
  * impossible to use nan(3) portably anyway, so this seems good enough.
  */
 DLLEXPORT void
-_scan_nan(u_int32_t *words, int num_words, const char *s)
+__scan_nan(u_int32_t *words, int num_words, const char *s)
 {
 	int si;		/* index into s */
 	int bitpos;	/* index into words (in bits) */
@@ -97,7 +97,7 @@ nan(const char *s)
 		u_int32_t bits[2];
 	} u;
 
-	_scan_nan(u.bits, 2, s);
+	__scan_nan(u.bits, 2, s);
 #if _BYTE_ORDER == _LITTLE_ENDIAN
 	u.bits[1] |= 0x7ff80000;
 #else
@@ -114,7 +114,7 @@ nanf(const char *s)
 		u_int32_t bits[1];
 	} u;
 
-	_scan_nan(u.bits, 1, s);
+	__scan_nan(u.bits, 1, s);
 	u.bits[0] |= 0x7fc00000;
 	return (u.f);
 }