Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit37a65d1

Browse files
committed
Remove configure probes for sys/ipc.h, sys/sem.h, sys/shm.h.
These are in SUSv2 and every targeted Unix system has them. It's nothard to avoid including them on Windows system because they're mostlyused in platform-specific translation units.Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>Discussion:https://postgr.es/m/CA%2BhUKG%2BL_3brvh%3D8e0BW_VfX9h7MtwgN%3DnFHP5o7X2oZucY9dg%40mail.gmail.com
1 parent7e50b4e commit37a65d1

File tree

8 files changed

+7
-40
lines changed

8 files changed

+7
-40
lines changed

‎config/c-library.m4

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,9 @@ fi
6868
AC_DEFUN([PGAC_UNION_SEMUN],
6969
[AC_CHECK_TYPES([union semun],[],[],
7070
[#include <sys/types.h>
71-
#ifdef HAVE_SYS_IPC_H
7271
#include <sys/ipc.h>
73-
#endif
74-
#ifdef HAVE_SYS_SEM_H
7572
#include <sys/sem.h>
76-
#endif])])# PGAC_UNION_SEMUN
73+
])])# PGAC_UNION_SEMUN
7774

7875

7976
# PGAC_STRUCT_SOCKADDR_STORAGE

‎configure

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13874,7 +13874,7 @@ $as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
1387413874
fi
1387513875

1387613876

13877-
for ac_header in atomic.h copyfile.h execinfo.h getopt.h ifaddrs.h langinfo.h mbarrier.h net/if.h netinet/tcp.h sys/epoll.h sys/event.h sys/ipc.h sys/personality.h sys/prctl.h sys/procctl.h sys/resource.h sys/sem.h sys/shm.h sys/signalfd.h sys/sockio.h sys/ucred.h termios.h ucred.h
13877+
for ac_header in atomic.h copyfile.h execinfo.h getopt.h ifaddrs.h langinfo.h mbarrier.h net/if.h netinet/tcp.h sys/epoll.h sys/event.h sys/personality.h sys/prctl.h sys/procctl.h sys/resource.h sys/signalfd.h sys/sockio.h sys/ucred.h termios.h ucred.h
1387813878
do :
1387913879
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
1388013880
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -15092,12 +15092,9 @@ fi
1509215092

1509315093

1509415094
ac_fn_c_check_type "$LINENO" "union semun" "ac_cv_type_union_semun" "#include <sys/types.h>
15095-
#ifdef HAVE_SYS_IPC_H
1509615095
#include <sys/ipc.h>
15097-
#endif
15098-
#ifdef HAVE_SYS_SEM_H
1509915096
#include <sys/sem.h>
15100-
#endif
15097+
1510115098
"
1510215099
if test "x$ac_cv_type_union_semun" = xyes; then :
1510315100

‎configure.ac

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1456,13 +1456,10 @@ AC_CHECK_HEADERS(m4_normalize([
14561456
netinet/tcp.h
14571457
sys/epoll.h
14581458
sys/event.h
1459-
sys/ipc.h
14601459
sys/personality.h
14611460
sys/prctl.h
14621461
sys/procctl.h
14631462
sys/resource.h
1464-
sys/sem.h
1465-
sys/shm.h
14661463
sys/signalfd.h
14671464
sys/sockio.h
14681465
sys/ucred.h

‎src/backend/port/sysv_sema.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,9 @@
1717
#include<signal.h>
1818
#include<unistd.h>
1919
#include<sys/file.h>
20-
#include<sys/stat.h>
21-
#ifdefHAVE_SYS_IPC_H
2220
#include<sys/ipc.h>
23-
#endif
24-
#ifdefHAVE_SYS_SEM_H
2521
#include<sys/sem.h>
26-
#endif
22+
#include<sys/stat.h>
2723

2824
#include"miscadmin.h"
2925
#include"storage/ipc.h"

‎src/backend/port/sysv_shmem.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,10 @@
2222
#include<signal.h>
2323
#include<unistd.h>
2424
#include<sys/file.h>
25-
#include<sys/mman.h>
26-
#include<sys/stat.h>
27-
#ifdefHAVE_SYS_IPC_H
2825
#include<sys/ipc.h>
29-
#endif
30-
#ifdefHAVE_SYS_SHM_H
26+
#include<sys/mman.h>
3127
#include<sys/shm.h>
32-
#endif
28+
#include<sys/stat.h>
3329

3430
#include"miscadmin.h"
3531
#include"port/pg_bitutils.h"

‎src/backend/storage/ipc/dsm_impl.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,9 @@
5353
#include<unistd.h>
5454
#ifndefWIN32
5555
#include<sys/mman.h>
56-
#endif
57-
#include<sys/stat.h>
58-
#ifdefHAVE_SYS_IPC_H
5956
#include<sys/ipc.h>
60-
#endif
61-
#ifdefHAVE_SYS_SHM_H
6257
#include<sys/shm.h>
58+
#include<sys/stat.h>
6359
#endif
6460

6561
#include"common/file_perm.h"

‎src/include/pg_config.h.in

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -496,9 +496,6 @@
496496
/* Define to 1 if you have the <sys/event.h> header file. */
497497
#undef HAVE_SYS_EVENT_H
498498

499-
/* Define to 1 if you have the <sys/ipc.h> header file. */
500-
#undef HAVE_SYS_IPC_H
501-
502499
/* Define to 1 if you have the <sys/personality.h> header file. */
503500
#undef HAVE_SYS_PERSONALITY_H
504501

@@ -511,12 +508,6 @@
511508
/* Define to 1 if you have the <sys/resource.h> header file. */
512509
#undef HAVE_SYS_RESOURCE_H
513510

514-
/* Define to 1 if you have the <sys/sem.h> header file. */
515-
#undef HAVE_SYS_SEM_H
516-
517-
/* Define to 1 if you have the <sys/shm.h> header file. */
518-
#undef HAVE_SYS_SHM_H
519-
520511
/* Define to 1 if you have the <sys/signalfd.h> header file. */
521512
#undef HAVE_SYS_SIGNALFD_H
522513

‎src/tools/msvc/Solution.pm

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -361,13 +361,10 @@ sub GenerateFiles
361361
HAVE_SYSLOG=>undef,
362362
HAVE_SYS_EPOLL_H=>undef,
363363
HAVE_SYS_EVENT_H=>undef,
364-
HAVE_SYS_IPC_H=>undef,
365364
HAVE_SYS_PERSONALITY_H=>undef,
366365
HAVE_SYS_PRCTL_H=>undef,
367366
HAVE_SYS_PROCCTL_H=>undef,
368367
HAVE_SYS_RESOURCE_H=>undef,
369-
HAVE_SYS_SEM_H=>undef,
370-
HAVE_SYS_SHM_H=>undef,
371368
HAVE_SYS_SIGNALFD_H=>undef,
372369
HAVE_SYS_SOCKIO_H=>undef,
373370
HAVE_SYS_STAT_H=> 1,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp