summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorirungentoo <irungentoo@gmail.com>2013-08-09 09:07:30 -0700
committerirungentoo <irungentoo@gmail.com>2013-08-09 09:07:30 -0700
commit79cbfb535e4b07ca76a6659b096623fab995f1c6 (patch)
tree3bac441ddc1202009a4a8cb212bbcbe39f7c8b4b
parentb9991e1d3c51ba5096efcad6760025de7c21d091 (diff)
parente3ab9af0e3340e2a8a20701021fc315c04da94aa (diff)
Merge pull request #411 from slvr/master
Macports support (OS X only). MAP_ANON -> MAP_ANONYMOUS (OS X only).
-rwxr-xr-xCMakeLists.txt8
-rwxr-xr-xauto_tests/friends_test.c4
2 files changed, 12 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0fea1a1..86b5d27b 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,14 @@ else()
10 option(USE_NACL "Use NaCl library instead of libsodium") 10 option(USE_NACL "Use NaCl library instead of libsodium")
11endif() 11endif()
12 12
13#OS X specific
14if(APPLE)
15 set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /opt/local/lib)
16 set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} /opt/local/include)
17 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I/opt/local/include" )
18 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/opt/local/lib")
19endif()
20
13if(UNIX) 21if(UNIX)
14 find_package(Curses REQUIRED) 22 find_package(Curses REQUIRED)
15endif() 23endif()
diff --git a/auto_tests/friends_test.c b/auto_tests/friends_test.c
index 6c7569be..0ba42b61 100755
--- a/auto_tests/friends_test.c
+++ b/auto_tests/friends_test.c
@@ -29,6 +29,10 @@
29#define WAIT_COUNT 30 29#define WAIT_COUNT 30
30#define WAIT_TIME 500 30#define WAIT_TIME 500
31 31
32#ifndef MAP_ANONYMOUS
33#define MAP_ANONYMOUS MAP_ANON
34#endif
35
32/* first step, second step */ 36/* first step, second step */
33#define FIRST_FLAG 0x1 37#define FIRST_FLAG 0x1
34#define SECOND_FLAG 0x2 38#define SECOND_FLAG 0x2