Clean up definitions and remove redundant defintions (__MACH__ and TARGET_OS_MAC)

+9 -4

src/CMakeLists.txt

··· 15 15 add_subdirectory(bsdln) 16 16 17 17 add_definitions( 18 - -D_DARWIN_C_SOURCE 19 - -D_POSIX_C_SOURCE 20 18 -DDARLING 21 - -D__APPLE__ 22 - -D__DYNAMIC__ 23 19 ) 24 20 25 21 set(DARLING TRUE) ··· 62 58 add_subdirectory(startup) 63 59 64 60 add_subdirectory(bootstrap_cmds) 61 + 62 + add_definitions( 63 + -D__APPLE__ 64 + -D__DYNAMIC__ 65 + -D__MACH__ 66 + -D_DARWIN_C_SOURCE 67 + -D_POSIX_C_SOURCE 68 + -DTARGET_OS_MAC=1 69 + ) 65 70 66 71 set(CMAKE_AR "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/ar/x86_64-apple-darwin11-ar") 67 72 set(CMAKE_RANLIB "${CMAKE_BINARY_DIR}/src/external/cctools-port/cctools/misc/ranlib")

-2

src/VideoDecodeAcceleration/CMakeLists.txt

··· 8 8 cmake_policy(SET CMP0003 NEW) 9 9 endif(COMMAND cmake_policy) 10 10 11 - add_definitions(-D__MACH__) 12 - add_definitions(-DTARGET_OS_MAC=1) 13 11 add_definitions(-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1080) 14 12 15 13 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -D__DARWIN_UNIX03 -fPIC -w")

-1

src/copyfile/CMakeLists.txt

··· 12 12 include_directories(${CMAKE_SOURCE_DIR}/src/kernel/libsyscall/wrappers) 13 13 include_directories(${CMAKE_CURRENT_SOURCE_DIR}) 14 14 15 - add_definitions(-DTARGET_OS_MAC=1) 16 15 add_definitions(-DHAVE_STDINT_H=1) 17 16 18 17 # Hide warnings

-2

src/csu/CMakeLists.txt

··· 8 8 cmake_policy(SET CMP0003 NEW) 9 9 endif(COMMAND cmake_policy) 10 10 11 - add_definitions(-DTARGET_OS_MAC=1) 12 - 13 11 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -D__DARWIN_UNIX03 -fPIC -w") 14 12 15 13 #include_directories(${DARLING_TOP_DIRECTORY}/src/libc/include/FreeBSD)

-1

src/duct/src/CMakeLists.txt

··· 2 2 3 3 cmake_minimum_required(VERSION 2.4.0) 4 4 5 - add_definitions(-DTARGET_OS_MAC=1) 6 5 add_definitions(-DHAVE_STDINT_H=1) 7 6 add_definitions(-DPRIVATE) 8 7 add_definitions(-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1080)

-1

src/dyld/CMakeLists.txt

··· 14 14 set(CMAKE_SHARED_LINKER_FLAGS_SAVED "${CMAKE_SHARED_LINKER_FLAGS}") 15 15 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib -Wl,-bind_at_load -Wl,-flat_namespace -Wl,-undefined,suppress") 16 16 17 - add_definitions(-DTARGET_OS_MAC=1) 18 17 add_definitions(-DHAVE_STDINT_H=1) 19 18 20 19 include_directories(${CMAKE_SOURCE_DIR}/src/launchd/liblaunch)

-1

src/kernel/CMakeLists.txt

··· 31 31 #add_darling_library(fakedyld SHARED fakedyld.c) 32 32 #make_fat(fakedyld) 33 33 34 - add_definitions(-DTARGET_OS_MAC=1) 35 34 add_definitions(-DHAVE_STDINT_H=1) 36 35 add_definitions(-DPRIVATE=1) 37 36

-1

src/keymgr/CMakeLists.txt

··· 9 9 include_directories(${CMAKE_SOURCE_DIR}/kernel/libsyscall/wrappers) 10 10 include_directories(${CMAKE_SOURCE_DIR}/src/libc/darwin) 11 11 12 - add_definitions(-DTARGET_OS_MAC=1) 13 12 add_definitions(-DHAVE_STDINT_H=1) 14 13 15 14 set(keymgr_sources

-1

src/libc/CMakeLists.txt

··· 6 6 cmake_policy(SET CMP0018 NEW) 7 7 endif(COMMAND cmake_policy) 8 8 9 - add_definitions(-DTARGET_OS_MAC=1) 10 9 add_definitions(-DHAVE_STDINT_H=1) 11 10 add_definitions(-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1090) 12 11 add_definitions(-D__LIBC__ -D__DARWIN_UNIX03=1 -D__DARWIN_64_BIT_INO_T=1 -D__DARWIN_NON_CANCELABLE=1 -D__DARWIN_VERS_1050=1)

-2

src/libedit/CMakeLists.txt

··· 6 6 cmake_policy(SET CMP0003 NEW) 7 7 endif(COMMAND cmake_policy) 8 8 9 - add_definitions(-D__MACH__) 10 - add_definitions(-DTARGET_OS_MAC=1) 11 9 add_definitions(-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1080) 12 10 13 11 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -D__DARWIN_UNIX03 -fPIC -w")

-1

src/libiconv/CMakeLists.txt

··· 6 6 cmake_policy(SET CMP0003 NEW) 7 7 endif(COMMAND cmake_policy) 8 8 9 - add_definitions(-DTARGET_OS_MAC=1) 10 9 add_definitions(-DHAVE_STDINT_H=1) 11 10 add_definitions(-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1080) 12 11

-1

src/libinfo/CMakeLists.txt

··· 10 10 add_definitions(-DTARGET_CPU_X86_64=1) 11 11 endif(CMAKE_SIZEOF_VOID_P EQUAL 4 OR CMAKE_INSTALL_LIBDIR STREQUAL "lib32") 12 12 13 - add_definitions(-DTARGET_OS_MAC=1) 14 13 add_definitions(-DHAVE_STDINT_H=1) 15 14 add_definitions(-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1080) 16 15

-1

src/libmacho/CMakeLists.txt

··· 2 2 3 3 cmake_minimum_required(VERSION 2.4.0) 4 4 5 - add_definitions(-DTARGET_OS_MAC=1) 6 5 add_definitions(-DHAVE_STDINT_H=1) 7 6 add_definitions(-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1080) 8 7

-1

src/libmalloc/CMakeLists.txt

··· 16 16 add_definitions( 17 17 -DPRIVATE 18 18 -DOS_UNFAIR_LOCK_INLINE=1 19 - -DTARGET_OS_MAC=1 20 19 -D__DARWIN_UNIX03 21 20 ) 22 21

-1

src/libsystem/CMakeLists.txt

··· 17 17 include_directories(${CMAKE_SOURCE_DIR}/src/kernel/libsyscall) 18 18 include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src/dyld-apple/include) 19 19 20 - add_definitions(-DTARGET_OS_MAC=1) 21 20 add_definitions(-DHAVE_STDINT_H=1 -DHAVE_SYSTEM_CORESERVICES) 22 21 23 22 # Hide warnings

-2

src/libsystem_coreservices/CMakeLists.txt

··· 2 2 3 3 cmake_minimum_required(VERSION 2.4.0) 4 4 5 - add_definitions(-DTARGET_OS_MAC=1) 6 - 7 5 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -D__DARWIN_UNIX03 -fPIC -w") 8 6 9 7 include_directories(${CMAKE_SOURCE_DIR}/src/kernel/libsyscall/wrappers)

-1

src/ncurses/CMakeLists.txt

··· 13 13 #include_directories("${CMAKE_SOURCE_DIR}/src/libc/locale/FreeBSD") 14 14 include_directories("${CMAKE_SOURCE_DIR}/src/libc/stdtime/FreeBSD") 15 15 16 - add_definitions(-DTARGET_OS_MAC=1) 17 16 add_definitions(-D _XOPEN_SOURCE_EXTENDED=1) 18 17 #add_definitions(-DTRACE) 19 18

Configure Feed

Configure Feed