Skip to content

Commit 28bf3b0

Browse files
authored
Merge pull request #4257 from ron-at-swgy/OpenBSD-Updates
Updates for OpenBSD build support
2 parents 870edf6 + 5e76752 commit 28bf3b0

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

ortools/base/sysinfo.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#if defined(__APPLE__) && defined(__GNUC__) // MacOS
1818
#include <mach/mach_init.h>
1919
#include <mach/task.h>
20-
#elif defined(__FreeBSD__) // FreeBSD
20+
#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) // FreeBSD or OpenBSD
2121
#include <sys/resource.h>
2222
#include <sys/time.h>
2323
// Windows
@@ -49,7 +49,8 @@ int64_t GetProcessMemoryUsage() {
4949
return resident_memory;
5050
}
5151
#elif defined(__GNUC__) && !defined(__FreeBSD__) && \
52-
!defined(__EMSCRIPTEN__) && !defined(_WIN32) // Linux
52+
!defined(__OpenBSD__) && !defined(__EMSCRIPTEN__) && \
53+
!defined(_WIN32) // Linux
5354
int64_t GetProcessMemoryUsage() {
5455
unsigned size = 0;
5556
char buf[30];
@@ -61,7 +62,7 @@ int64_t GetProcessMemoryUsage() {
6162
fclose(pf);
6263
return int64_t{1024} * size;
6364
}
64-
#elif defined(__FreeBSD__) // FreeBSD
65+
#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) // FreeBSD or OpenBSD
6566
int64_t GetProcessMemoryUsage() {
6667
int who = RUSAGE_SELF;
6768
struct rusage rusage;

ortools/python/setup.py.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ setup(
136136
'Operating System :: Unix',
137137
'Operating System :: POSIX :: Linux',
138138
'Operating System :: POSIX :: BSD :: FreeBSD',
139+
'Operating System :: POSIX :: BSD :: OpenBSD',
139140
'Operating System :: MacOS',
140141
'Operating System :: MacOS :: MacOS X',
141142
'Operating System :: Microsoft :: Windows',

ortools/util/zvector.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
#ifndef OR_TOOLS_UTIL_ZVECTOR_H_
1515
#define OR_TOOLS_UTIL_ZVECTOR_H_
1616

17-
#if (defined(__APPLE__) || defined(__FreeBSD__)) && defined(__GNUC__)
17+
#if (defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)) && \
18+
defined(__GNUC__)
1819
#include <machine/endian.h>
1920
#elif !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(__MINGW64__)
2021
#include <endian.h>

0 commit comments

Comments
 (0)