Skip to content

Commit 960fdbf

Browse files
committed
Merge pull request #128 from JuliaLang/kf/clangwarnings
Fix Clang warnings on Windows
2 parents 4fcad15 + 28fb939 commit 960fdbf

209 files changed

Lines changed: 502 additions & 490 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

amd64/bsd_asm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
#define _START_ENTRY_WIN .code; _START_ENTRY
7777
#endif
7878
#define _ENTRY(x) _START_ENTRY_WIN; \
79-
.globl CNAME(x); .section .drectve; .ascii " -export:" #x; \
79+
.globl CNAME(x); .section .drectve; .ascii " -export:", #x; \
8080
.section .text; .def CNAME(x); .scl 2; .type 32; .endef; CNAME(x):
8181
#endif
8282

amd64/fenv.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "math_private.h"
3131

3232
#ifdef _WIN32
33-
#define __fenv_static
33+
#define __fenv_static OLM_DLLEXPORT
3434
#endif
3535
#include <openlibm_fenv.h>
3636

@@ -48,10 +48,10 @@ const fenv_t __fe_dfl_env = {
4848
__INITIAL_MXCSR__
4949
};
5050

51-
extern inline DLLEXPORT int feclearexcept(int __excepts);
52-
extern inline DLLEXPORT int fegetexceptflag(fexcept_t *__flagp, int __excepts);
51+
extern inline OLM_DLLEXPORT int feclearexcept(int __excepts);
52+
extern inline OLM_DLLEXPORT int fegetexceptflag(fexcept_t *__flagp, int __excepts);
5353

54-
DLLEXPORT int
54+
OLM_DLLEXPORT int
5555
fesetexceptflag(const fexcept_t *flagp, int excepts)
5656
{
5757
fenv_t env;
@@ -69,7 +69,7 @@ fesetexceptflag(const fexcept_t *flagp, int excepts)
6969
return (0);
7070
}
7171

72-
DLLEXPORT int
72+
OLM_DLLEXPORT int
7373
feraiseexcept(int excepts)
7474
{
7575
fexcept_t ex = excepts;
@@ -79,11 +79,11 @@ feraiseexcept(int excepts)
7979
return (0);
8080
}
8181

82-
extern inline DLLEXPORT int fetestexcept(int __excepts);
83-
extern inline DLLEXPORT int fegetround(void);
84-
extern inline DLLEXPORT int fesetround(int __round);
82+
extern inline OLM_DLLEXPORT int fetestexcept(int __excepts);
83+
extern inline OLM_DLLEXPORT int fegetround(void);
84+
extern inline OLM_DLLEXPORT int fesetround(int __round);
8585

86-
DLLEXPORT int
86+
OLM_DLLEXPORT int
8787
fegetenv(fenv_t *envp)
8888
{
8989

@@ -97,7 +97,7 @@ fegetenv(fenv_t *envp)
9797
return (0);
9898
}
9999

100-
DLLEXPORT int
100+
OLM_DLLEXPORT int
101101
feholdexcept(fenv_t *envp)
102102
{
103103
uint32_t mxcsr;
@@ -112,9 +112,9 @@ feholdexcept(fenv_t *envp)
112112
return (0);
113113
}
114114

115-
extern inline DLLEXPORT int fesetenv(const fenv_t *__envp);
115+
extern inline OLM_DLLEXPORT int fesetenv(const fenv_t *__envp);
116116

117-
DLLEXPORT int
117+
OLM_DLLEXPORT int
118118
feupdateenv(const fenv_t *envp)
119119
{
120120
uint32_t mxcsr;

bsdsrc/b_exp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ static const double lntiny = -0x1.77af8ebeae354p9;
8383
static const double invln2 = 0x1.71547652b82fep0;
8484

8585
#if 0
86-
DLLEXPORT double exp(x)
86+
OLM_DLLEXPORT double exp(x)
8787
double x;
8888
{
8989
double z,hi,lo,c;

bsdsrc/b_log.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ static double logF_tail[N+1] = {
351351
};
352352

353353
#if 0
354-
DLLEXPORT double
354+
OLM_DLLEXPORT double
355355
#ifdef _ANSI_SOURCE
356356
log(double x)
357357
#else

bsdsrc/b_tgamma.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ static struct Double ratfun_gam(double, double);
122122

123123
static const double zero = 0., one = 1.0, tiny = 1e-300;
124124

125-
DLLEXPORT double
125+
OLM_DLLEXPORT double
126126
tgamma(x)
127127
double x;
128128
{

i387/bsd_ieeefp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ fpsetround(fp_rnd_t _m)
172172
}
173173

174174
//static __inline fp_prec_t
175-
DLLEXPORT fp_prec_t
175+
OLM_DLLEXPORT fp_prec_t
176176
fpgetprec(void)
177177
{
178178
unsigned short _cw;
@@ -182,7 +182,7 @@ fpgetprec(void)
182182
}
183183

184184
//static __inline fp_prec_t
185-
DLLEXPORT fp_prec_t
185+
OLM_DLLEXPORT fp_prec_t
186186
fpsetprec(fp_prec_t _m)
187187
{
188188
fp_prec_t _p;

i387/fenv.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ __test_sse(void)
9090
return (0);
9191
}
9292

93-
extern inline DLLEXPORT int feclearexcept(int __excepts);
94-
extern inline DLLEXPORT int fegetexceptflag(fexcept_t *__flagp, int __excepts);
93+
extern inline OLM_DLLEXPORT int feclearexcept(int __excepts);
94+
extern inline OLM_DLLEXPORT int fegetexceptflag(fexcept_t *__flagp, int __excepts);
9595

96-
DLLEXPORT int
96+
OLM_DLLEXPORT int
9797
fesetexceptflag(const fexcept_t *flagp, int excepts)
9898
{
9999
fenv_t env;
@@ -114,7 +114,7 @@ fesetexceptflag(const fexcept_t *flagp, int excepts)
114114
return (0);
115115
}
116116

117-
DLLEXPORT int
117+
OLM_DLLEXPORT int
118118
feraiseexcept(int excepts)
119119
{
120120
fexcept_t ex = excepts;
@@ -124,9 +124,9 @@ feraiseexcept(int excepts)
124124
return (0);
125125
}
126126

127-
extern inline DLLEXPORT int fetestexcept(int __excepts);
128-
extern inline DLLEXPORT int fegetround(void);
129-
extern inline DLLEXPORT int fesetround(int __round);
127+
extern inline OLM_DLLEXPORT int fetestexcept(int __excepts);
128+
extern inline OLM_DLLEXPORT int fegetround(void);
129+
extern inline OLM_DLLEXPORT int fesetround(int __round);
130130

131131
int
132132
fegetenv(fenv_t *envp)
@@ -163,9 +163,9 @@ feholdexcept(fenv_t *envp)
163163
return (0);
164164
}
165165

166-
extern inline DLLEXPORT int fesetenv(const fenv_t *__envp);
166+
extern inline OLM_DLLEXPORT int fesetenv(const fenv_t *__envp);
167167

168-
DLLEXPORT int
168+
OLM_DLLEXPORT int
169169
feupdateenv(const fenv_t *envp)
170170
{
171171
uint32_t mxcsr;

include/openlibm_fenv_amd64.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ fegetexceptflag(fexcept_t *__flagp, int __excepts)
125125
return (0);
126126
}
127127

128-
int fesetexceptflag(const fexcept_t *__flagp, int __excepts);
129-
int feraiseexcept(int __excepts);
128+
OLM_DLLEXPORT int fesetexceptflag(const fexcept_t *__flagp, int __excepts);
129+
OLM_DLLEXPORT int feraiseexcept(int __excepts);
130130

131131
__fenv_static __attribute__((always_inline)) inline int
132132
fetestexcept(int __excepts)
@@ -176,8 +176,8 @@ fesetround(int __round)
176176
return (0);
177177
}
178178

179-
int fegetenv(fenv_t *__envp);
180-
int feholdexcept(fenv_t *__envp);
179+
OLM_DLLEXPORT int fegetenv(fenv_t *__envp);
180+
OLM_DLLEXPORT int feholdexcept(fenv_t *__envp);
181181

182182
__fenv_static inline int
183183
fesetenv(const fenv_t *__envp)
@@ -196,12 +196,12 @@ fesetenv(const fenv_t *__envp)
196196
return (0);
197197
}
198198

199-
int feupdateenv(const fenv_t *__envp);
199+
OLM_DLLEXPORT int feupdateenv(const fenv_t *__envp);
200200

201201
#if __BSD_VISIBLE
202202

203-
int feenableexcept(int __mask);
204-
int fedisableexcept(int __mask);
203+
OLM_DLLEXPORT int feenableexcept(int __mask);
204+
OLM_DLLEXPORT int fedisableexcept(int __mask);
205205

206206
/* We currently provide no external definition of fegetexcept(). */
207207
static inline int

0 commit comments

Comments
 (0)