Skip to content

Commit

Permalink
Restore <wtype.h> to fix build break on Posix.
Browse files Browse the repository at this point in the history
  • Loading branch information
dheld committed Jul 15, 2012
1 parent 26102ea commit 15d0705
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
10 changes: 7 additions & 3 deletions src/root/port.c
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@

// Copyright (c) 1999-2011 by Digital Mars
// Copyright (c) 1999-2012 by Digital Mars
// All Rights Reserved
// written by Walter Bright
// http://www.digitalmars.com

#include "port.h"

#if __DMC__
#include <math.h>
#include <float.h>
#include <fp.h>
#include <time.h>
#include <stdlib.h>
#include <string.h>
#include <wchar.h>

double Port::nan = NAN;
double Port::infinity = INFINITY;
Expand Down Expand Up @@ -127,6 +129,7 @@ char *Port::strupr(char *s)
#include <errno.h>
#include <string.h>
#include <ctype.h>
#include <wchar.h>
#include <stdlib.h>
#include <limits> // for std::numeric_limits

Expand Down Expand Up @@ -343,6 +346,7 @@ char *Port::strupr(char *s)
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <wchar.h>
#include <float.h>
#include <assert.h>

Expand Down Expand Up @@ -510,7 +514,7 @@ char *Port::strupr(char *s)

#endif

#if __sun&&__SVR4
#if __sun && __SVR4

#define __C99FEATURES__ 1 // Needed on Solaris for NaN and more
#include <math.h>
Expand All @@ -520,6 +524,7 @@ char *Port::strupr(char *s)
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <wchar.h>
#include <float.h>
#include <ieeefp.h>

Expand Down Expand Up @@ -648,4 +653,3 @@ char *Port::strupr(char *s)
}

#endif

7 changes: 1 addition & 6 deletions src/root/port.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

// Copyright (c) 1999-2009 by Digital Mars
// Copyright (c) 1999-2012 by Digital Mars
// All Rights Reserved
// written by Walter Bright
// http://www.digitalmars.com
Expand All @@ -12,9 +12,6 @@

#include "longdouble.h"

#ifndef TYPEDEFS
#define TYPEDEFS

#if _MSC_VER
#include <float.h> // for _isnan
#include <malloc.h> // for alloca
Expand All @@ -30,8 +27,6 @@ typedef long long longlong;
typedef unsigned long long ulonglong;
#endif

#endif

typedef double d_time;

struct Port
Expand Down

0 comments on commit 15d0705

Please sign in to comment.