Skip to content

Commit 645efba

Browse files
committed
Move getlogin and HAVE_GETLOGIN to ext/posix only
1 parent 81645e1 commit 645efba

File tree

5 files changed

+4
-5
lines changed

5 files changed

+4
-5
lines changed

cmake/cmake/ConfigureChecks.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,6 @@ block()
309309
check_symbol_exists(getloadavg "${headers}" HAVE_GETLOADAVG)
310310
endblock()
311311

312-
check_symbol_exists(getlogin unistd.h HAVE_GETLOGIN)
313312
check_symbol_exists(getrusage sys/resource.h HAVE_GETRUSAGE)
314313
check_symbol_exists(gettimeofday sys/time.h HAVE_GETTIMEOFDAY)
315314
check_symbol_exists(getpwnam_r pwd.h HAVE_GETPWNAM_R)

cmake/cmake/platforms/Windows.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
8080
set(HAVE_GCC_GLOBAL_REGS FALSE)
8181
set(HAVE_GETGRNAM_R FALSE)
8282
set(HAVE_GETLOADAVG FALSE)
83-
set(HAVE_GETLOGIN FALSE)
8483
set(HAVE_GETPWNAM_R FALSE)
8584
set(HAVE_GETPWUID_R FALSE)
8685
set(HAVE_GETRANDOM FALSE)

cmake/ext/posix/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ cmake_push_check_state(RESET)
8383
cmake_pop_check_state()
8484
check_symbol_exists(getgrgid_r grp.h HAVE_GETGRGID_R)
8585
check_symbol_exists(getgroups unistd.h HAVE_GETGROUPS)
86+
check_symbol_exists(getlogin unistd.h HAVE_GETLOGIN)
8687
check_symbol_exists(getpgid unistd.h HAVE_GETPGID)
8788
check_symbol_exists(getrlimit sys/resource.h HAVE_GETRLIMIT)
8889
check_symbol_exists(getsid unistd.h HAVE_GETSID)

cmake/ext/posix/cmake/config.h.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
/* Define to 1 if you have the 'getgroups' function. */
1414
#cmakedefine HAVE_GETGROUPS 1
1515

16+
/* Define to 1 if you have the 'getlogin' function. */
17+
#cmakedefine HAVE_GETLOGIN 1
18+
1619
/* Define to 1 if you have the 'getpgid' function. */
1720
#cmakedefine HAVE_GETPGID 1
1821

cmake/main/cmake/php_config.h.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,6 @@
185185
/* Define to 1 if you have the 'getloadavg' function. */
186186
#cmakedefine HAVE_GETLOADAVG 1
187187

188-
/* Define to 1 if you have the 'getlogin' function. */
189-
#cmakedefine HAVE_GETLOGIN 1
190-
191188
/* Define to 1 if you have the 'getprotobyname' function. */
192189
#cmakedefine HAVE_GETPROTOBYNAME 1
193190

0 commit comments

Comments
 (0)