Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for Unix detection (test for __UNIX__ in include/wx/defs.h) and for

Browse Source 
NetBSD detection in configure


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-04-14 18:29:30 +00:00
parent f568f52dd8
commit 87f968fb5a
4 changed files with 515 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

992
configure vendored
View File

File diff suppressed because it is too large Load Diff

10
configure.in
View File

@@ -492,6 +492,7 @@ USE_ALPHA=
USE_OSF= USE_OSF=
USE_BSD= USE_BSD=
USE_FREEBSD= USE_FREEBSD=
USE_NETBSD=
USE_VMS= USE_VMS=
USE_ULTRIX= USE_ULTRIX=
USE_CYGWIN= USE_CYGWIN=
@@ -572,13 +573,20 @@ case "${host}" in
AC_DEFINE(__BSD__) AC_DEFINE(__BSD__)
DEFAULT_DEFAULT_wxUSE_MOTIF=1 DEFAULT_DEFAULT_wxUSE_MOTIF=1
;; ;;
*-*-freebsd* | *-*-netbsd*) *-*-freebsd*)
USE_BSD=1 USE_BSD=1
USE_FREEBSD=1 USE_FREEBSD=1
AC_DEFINE(__FREEBSD__) AC_DEFINE(__FREEBSD__)
AC_DEFINE(__BSD__) AC_DEFINE(__BSD__)
DEFAULT_DEFAULT_wxUSE_GTK=1 DEFAULT_DEFAULT_wxUSE_GTK=1
;; ;;
*-*-netbsd*)
USE_BSD=1
USE_NETBSD=1
AC_DEFINE(__FREEBSD__)
AC_DEFINE(__NETBSD__)
DEFAULT_DEFAULT_wxUSE_GTK=1
;;
*-*-osf* ) *-*-osf* )
USE_ALPHA=1 USE_ALPHA=1
USE_OSF=1 USE_OSF=1

4
include/wx/defs.h
View File

@@ -22,8 +22,8 @@
// OS: first test for generic Unix defines, then for particular flavours and // OS: first test for generic Unix defines, then for particular flavours and
// finally for Unix-like systems // finally for Unix-like systems
#if defined(__unix) || defined(__unix__) || defined(____SVR4____) || \ #if defined(__UNIX__) || defined(__unix) || defined(__unix__) || \
defined(__LINUX__) || defined(__sgi) || \ defined(____SVR4____) || defined(__LINUX__) || defined(__sgi) || \
defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \ defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \
defined(__EMX__) || defined(__VMS) || defined(__BEOS__) defined(__EMX__) || defined(__VMS) || defined(__BEOS__)

1
setup.h.in
View File

@@ -86,6 +86,7 @@
#undef __OSF__ #undef __OSF__
#undef __BSD__ #undef __BSD__
#undef __FREEBSD__ #undef __FREEBSD__
#undef __NETBSD__
#undef __VMS__ #undef __VMS__
#undef __ULTRIX__ #undef __ULTRIX__
#undef __DATA_GENERAL__ #undef __DATA_GENERAL__