Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nodegit
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xielei
nodegit
Commits
f7d04046
Unverified
Commit
f7d04046
authored
Dec 20, 2017
by
Tyler Wanek
Committed by
GitHub
Dec 20, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1374 from rsmarples/fix-openssl-NetBSD
build: add NetBSD support to opensslconf.h
parents
8189ec0f
ea2b4332
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
2 deletions
+10
-2
vendor/openssl/config/opensslconf.h
vendor/openssl/config/opensslconf.h
+10
-2
No files found.
vendor/openssl/config/opensslconf.h
View file @
f7d04046
...
...
@@ -37,6 +37,8 @@
| solaris | x64 | solaris64-x86_64-gcc | o |
| freebsd | ia32 | BSD-x86 | o |
| freebsd | x64 | BSD-x86_64 | o |
| netbsd | ia32 | BSD-x86 | o |
| netbsd | x64 | BSD-x86_64 | o |
| openbsd | ia32 | BSD-x86 | - |
| openbsd | x64 | BSD-x86_64 | - |
| others | others | linux-elf | - |
...
...
@@ -51,6 +53,7 @@
| mac | __APPLE__ && __MACH__ |
| solaris | __sun |
| freebsd | __FreeBSD__ |
| netbsd | __NetBSD__ |
| openbsd | __OpenBSD__ |
| linux (not andorid)| __linux__ && !__ANDROID__ |
| android | __ANDROID__ |
...
...
@@ -94,6 +97,11 @@
# define OPENSSL_LINUX 1
#endif
#undef OPENSSL_BSD
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
# define OPENSSL_BSD 1
#endif
#if defined(OPENSSL_LINUX) && defined(__i386__)
# include "./archs/linux-elf/opensslconf.h"
#elif defined(OPENSSL_LINUX) && defined(__ILP32__)
...
...
@@ -112,9 +120,9 @@
# include "./archs/VC-WIN32/opensslconf.h"
#elif defined(_WIN32) && defined(_M_X64)
# include "./archs/VC-WIN64A/opensslconf.h"
#elif
(defined(__FreeBSD__) || defined(__OpenBSD__)
) && defined(__i386__)
#elif
defined(OPENSSL_BSD
) && defined(__i386__)
# include "./archs/BSD-x86/opensslconf.h"
#elif
(defined(__FreeBSD__) || defined(__OpenBSD__)
) && defined(__x86_64__)
#elif
defined(OPENSSL_BSD
) && defined(__x86_64__)
# include "./archs/BSD-x86_64/opensslconf.h"
#elif defined(__sun) && defined(__i386__)
# include "./archs/solaris-x86-gcc/opensslconf.h"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment