mirror of
https://github.com/weechat/weechat.git
synced 2026-07-04 00:33:13 +02:00
core: replace "Mac OS X" and "OS X" by "macOS" (issue #1272)
This commit is contained in:
@@ -1198,7 +1198,10 @@ network_connect_child (struct t_hook *hook_connect)
|
||||
msg.msg_control = msg_buf;
|
||||
msg.msg_controllen = sizeof (msg_buf);
|
||||
|
||||
/* send 1 byte of data (not required on Linux, required by BSD/OSX) */
|
||||
/*
|
||||
* send 1 byte of data
|
||||
* (not required on Linux, required by BSD/macOS)
|
||||
*/
|
||||
memset (iov, 0, sizeof (iov));
|
||||
iov[0].iov_base = iov_data;
|
||||
iov[0].iov_len = 1;
|
||||
@@ -1459,7 +1462,10 @@ network_connect_child_read_cb (const void *pointer, void *data, int fd)
|
||||
msg.msg_control = msg_buf;
|
||||
msg.msg_controllen = sizeof (msg_buf);
|
||||
|
||||
/* recv 1 byte of data (not required on Linux, required by BSD/OSX) */
|
||||
/*
|
||||
* recv 1 byte of data
|
||||
* (not required on Linux, required by BSD/macOS)
|
||||
*/
|
||||
memset (iov, 0, sizeof (iov));
|
||||
iov[0].iov_base = iov_data;
|
||||
iov[0].iov_len = 1;
|
||||
|
||||
@@ -42,7 +42,7 @@ list(APPEND EXTRA_LIBS "m")
|
||||
list(APPEND EXTRA_LIBS ${CURL_LIBRARIES})
|
||||
|
||||
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
# link with resolv lib on Mac OS X
|
||||
# link with resolv lib on macOS
|
||||
list(APPEND EXTRA_LIBS "resolv")
|
||||
endif()
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ endif()
|
||||
list(APPEND LINK_LIBS ${GCRYPT_LDFLAGS})
|
||||
|
||||
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
# link with resolv lib on Mac OS X
|
||||
# link with resolv lib on macOS
|
||||
list(APPEND LINK_LIBS "resolv")
|
||||
endif()
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ set_target_properties(perl PROPERTIES PREFIX "")
|
||||
|
||||
if(PERL_FOUND)
|
||||
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
# remove "-arch xxx" on Mac OS X
|
||||
# remove "-arch xxx" on macOS
|
||||
STRING(REGEX REPLACE "-arch ppc|-arch i386|-arch x86_64" "" PERL_CFLAGS "${PERL_CFLAGS}")
|
||||
STRING(REGEX REPLACE "-arch ppc|-arch i386|-arch x86_64" "" PERL_LFLAGS "${PERL_LFLAGS}")
|
||||
endif()
|
||||
|
||||
@@ -36,7 +36,7 @@ set(LINK_LIBS)
|
||||
list(APPEND LINK_LIBS ${GCRYPT_LDFLAGS})
|
||||
|
||||
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
# link with resolv lib on Mac OS X
|
||||
# link with resolv lib on macOS
|
||||
list(APPEND LINK_LIBS "resolv")
|
||||
endif()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user