Merge topic 'fix-ccmake-sun-gcc'
d4d0c942 ccmake: Fix recent compilation regression with GCC on Solaris
This commit is contained in:
commit
0063b6b43c
@ -14,10 +14,6 @@
|
|||||||
|
|
||||||
#include <cmConfigure.h>
|
#include <cmConfigure.h>
|
||||||
|
|
||||||
#if defined(__sun__) && defined(__GNUC__)
|
|
||||||
#define _MSE_INT_H
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(__hpux)
|
#if defined(__hpux)
|
||||||
#define _BOOL_DEFINED
|
#define _BOOL_DEFINED
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
|
@ -33,10 +33,6 @@
|
|||||||
#ifndef FORM_H
|
#ifndef FORM_H
|
||||||
#define FORM_H
|
#define FORM_H
|
||||||
|
|
||||||
#if defined(__sun__) && defined(__GNUC__)
|
|
||||||
#define _MSE_INT_H
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <cmFormConfigure.h>
|
#include <cmFormConfigure.h>
|
||||||
|
|
||||||
/* figure out which curses.h to include */
|
/* figure out which curses.h to include */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user