Bitcoin Forum
April 29, 2017, 09:27:22 AM *
News: Latest stable version of Bitcoin Core: 0.14.1  [Torrent]. (New!)
 
   Home   Help Search Donate Login Register  
Pages: [1]
  Print  
Author Topic: BSD detection  (Read 2393 times)
dkaparis
Jr. Member
*
Offline Offline

Activity: 53


View Profile
August 11, 2010, 11:00:16 PM
 #1

There is this piece of code in headers.h:

#ifdef __WXMAC_OSX__
#define __WXMAC__ 1
#define __WXOSX__ 1
#define __BSD__ 1
#endif
#endif


In my testing it's not caught on FreeBSD 8.1

I propose it be changed to:

#if (defined(__unix__) || defined(unix)) && !defined(USG)
#include <sys/param.h>
#endif


And then checks for BSD should be
#ifdef BSD
This is the recommended way of detecting BSD in the FreeBSD Porter's Handbook.

This change is already done in my CMake tree.
Advertised sites are not endorsed by the Bitcoin Forum. They may be unsafe, untrustworthy, or illegal in your jurisdiction. Advertise here.
1493458042
Hero Member
*
Offline Offline

Posts: 1493458042

View Profile Personal Message (Offline)

Ignore
1493458042
Reply with quote  #2

1493458042
Report to moderator
satoshi
Founder
Sr. Member
*
qt
Offline Offline

Activity: 364


View Profile
August 12, 2010, 12:02:06 AM
 #2

There is this piece of code in headers.h:

#ifdef __WXMAC_OSX__
#define __WXMAC__ 1
#define __WXOSX__ 1
#define __BSD__ 1
#endif
#endif

That code was a bad idea anyway, I'm deleting it.  Any Mac code should only use __WXMAC_OSX__, not __WXMAC__ or __WXOSX__, and we should stop using __BSD__.

Quote

#if (defined(__unix__) || defined(unix)) && !defined(USG)
#include <sys/param.h>
#endif

Will that definitely cause BSD to be defined on Mac?
dkaparis
Jr. Member
*
Offline Offline

Activity: 53


View Profile
August 12, 2010, 08:24:37 AM
 #3

Quote

#if (defined(__unix__) || defined(unix)) && !defined(USG)
#include <sys/param.h>
#endif

Will that definitely cause BSD to be defined on Mac?


Don't know if Mac OS X is technically a BSD and I don't have access to a Mac, maybe someone else may test it.
If there are other Mac (and not BSD) specialties, then we'd need to check both for __WXMAC_OSX__ and BSD or detect these in some other way altogether.
satoshi
Founder
Sr. Member
*
qt
Offline Offline

Activity: 364


View Profile
August 12, 2010, 09:14:20 PM
 #4

This is in SVN rev 130.  Check that it compiles right.

Code:
#if (defined(__unix__) || defined(unix)) && !defined(USG)
#include <sys/param.h>  // to get BSD define
#endif
#ifdef __WXMAC_OSX__
#ifndef BSD
#define BSD 1
#endif
#endif
dkaparis
Jr. Member
*
Offline Offline

Activity: 53


View Profile
August 13, 2010, 03:38:17 PM
 #5

Incorporated into the CMake tree. No problems on Windows and FreeBSD.
Pages: [1]
  Print  
 
Jump to:  

Sponsored by , a Bitcoin-accepting VPN.
Powered by MySQL Powered by PHP Powered by SMF 1.1.19 | SMF © 2006-2009, Simple Machines Valid XHTML 1.0! Valid CSS!