Skip to content

More header fixes #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 8, 2016
Merged

More header fixes #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
226faf4
Avoid redefining __pure2 in types-compat
nalimilan Mar 3, 2016
0df58e7
Use quotes instead of <> with #include for private headers
nalimilan Mar 3, 2016
e836b30
Avoid defining __pure2 if already defined
nalimilan Mar 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions i387/fenv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
* $FreeBSD: src/lib/msun/i387/fenv.c,v 1.8 2011/10/21 06:25:31 das Exp $
*/

#include <cdefs-compat.h>
#include <types-compat.h>
#include <math_private.h>
#include <i387/bsd_npx.h>
#include "cdefs-compat.h"
#include "types-compat.h"
#include "math_private.h"
#include "i387/bsd_npx.h"

#define __fenv_static
#include <openlibm_fenv.h>
Expand Down
2 changes: 1 addition & 1 deletion src/bsd_cdefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
* for a given compiler, let the compile fail if it is told to use
* a feature that we cannot live without.
*/
#if __GNUC_PREREQ__(2, 7) || defined(__INTEL_COMPILER)
#if !defined(__pure2) && (__GNUC_PREREQ__(2, 7) || defined(__INTEL_COMPILER))
#define __pure2 __attribute__((__const__))
#endif

Expand Down
11 changes: 0 additions & 11 deletions src/types-compat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,6 @@

#include <stdint.h>
#include <limits.h>
#include <stdint.h>

#ifdef __GLIBC__
/* Not sure what to do about __pure2 on linux */
#define __pure2
#endif

#ifdef _WIN32
/* Not sure what to do about __pure2 on windows */
#define __pure2
#endif

typedef uint8_t u_int8_t;
typedef uint16_t u_int16_t;
Expand Down