BSD detection | Bitcointalksearch.org

dkaparis

newbie

Activity: 53

Merit: 0

Incorporated into the CMake tree. No problems on Windows and FreeBSD.

satoshi

founder

Activity: 364

Merit: 6472

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

Code:

#if (defined(__unix__) || defined(unix)) && !defined(USG)
#include // to get BSD define
#endif
#ifdef __WXMAC_OSX__
#ifndef BSD
#define BSD 1
#endif
#endif

dkaparis

newbie

Activity: 53

Merit: 0

Quote from: satoshi on August 11, 2010, 08:02:06 PM

Quote

#if (defined(__unix__) || defined(unix)) && !defined(USG) #include #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

Activity: 364

Merit: 6472

Quote from: dkaparis on August 11, 2010, 07:00:16 PM

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 #endif

Will that definitely cause BSD to be defined on Mac?

dkaparis

newbie

Activity: 53

Merit: 0

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 #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.

Topic: BSD detection (Read 9102 times)