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

Commit5cfdd68

Browse files
committed
Rearrange include file contents into a saner order, add inclusion of
<signal.h>. Per Andrew Dunstan.
1 parente40ae56 commit5cfdd68

File tree

1 file changed

+54
-49
lines changed

1 file changed

+54
-49
lines changed

‎src/include/port/win32.h‎

Lines changed: 54 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.41 2004/12/01 23:42:26 momjian Exp $ */
1+
/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.42 2004/12/26 19:20:33 tgl Exp $ */
22

33
/* undefine and redefine after #include */
44
#undef mkdir
@@ -7,6 +7,9 @@
77
#include<windows.h>
88
#include<winsock.h>
99
#include<process.h>
10+
#include<signal.h>
11+
#include<errno.h>
12+
1013
#undef near
1114

1215
/* Must be here to avoid conflicting with prototype in windows.h */
@@ -103,16 +106,15 @@ intsemget(int semKey, int semNum, int flags);
103106
intsemop(intsemId,structsembuf*sops,intflag);
104107

105108

106-
/* In backend/port/win32/signal.c */
107-
externDLLIMPORTHANDLEpgwin32_signal_event;
108-
externHANDLEpgwin32_initial_signal_pipe;
109-
110-
voidpgwin32_signal_initialize(void);
111-
HANDLEpgwin32_create_signal_listener(pid_tpid);
112-
voidpgwin32_dispatch_queued_signals(void);
113-
voidpg_queue_signal(intsignum);
109+
/*
110+
* Signal stuff
111+
*/
112+
#defineWEXITSTATUS(w)(((w) >> 8) & 0xff)
113+
#defineWIFEXITED(w)(((w) & 0xff) == 0)
114+
#defineWIFSIGNALED(w)(((w) & 0x7f) > 0 && (((w) & 0x7f) < 0x7f))
115+
#defineWTERMSIG(w)((w) & 0x7f)
114116

115-
#definesigmask(sig) ( 1 << (sig-1) )
117+
#definesigmask(sig) ( 1 << ((sig)-1) )
116118

117119
/* Signal function return values */
118120
#undef SIG_DFL
@@ -122,44 +124,6 @@ voidpg_queue_signal(int signum);
122124
#defineSIG_ERR ((pqsigfunc)-1)
123125
#defineSIG_IGN ((pqsigfunc)1)
124126

125-
#ifndefFRONTEND
126-
#definepg_usleep(t) pgwin32_backend_usleep(t)
127-
voidpgwin32_backend_usleep(longmicrosec);
128-
#endif
129-
130-
/* In backend/port/win32/socket.c */
131-
#ifndefFRONTEND
132-
#definesocket(af,type,protocol) pgwin32_socket(af, type, protocol)
133-
#defineaccept(s,addr,addrlen) pgwin32_accept(s, addr, addrlen)
134-
#defineconnect(s,name,namelen) pgwin32_connect(s, name, namelen)
135-
#defineselect(n,r,w,e,timeout) pgwin32_select(n, r, w, e, timeout)
136-
#definerecv(s,buf,len,flags) pgwin32_recv(s, buf, len, flags)
137-
#definesend(s,buf,len,flags) pgwin32_send(s, buf, len, flags)
138-
139-
SOCKETpgwin32_socket(intaf,inttype,intprotocol);
140-
SOCKETpgwin32_accept(SOCKETs,structsockaddr*addr,int*addrlen);
141-
intpgwin32_connect(SOCKETs,conststructsockaddr*name,intnamelen);
142-
intpgwin32_select(intnfds,fd_set*readfs,fd_set*writefds,fd_set*exceptfds,conststructtimeval*timeout);
143-
intpgwin32_recv(SOCKETs,char*buf,intlen,intflags);
144-
intpgwin32_send(SOCKETs,char*buf,intlen,intflags);
145-
146-
constchar*pgwin32_socket_strerror(interr);
147-
intpgwin32_waitforsinglesocket(SOCKETs,intwhat);
148-
149-
/* in backend/port/win32/security.c */
150-
externintpgwin32_is_admin(void);
151-
externintpgwin32_is_service(void);
152-
#endif
153-
154-
/* in backend/port/win32/error.c */
155-
void_dosmaperr(unsigned long);
156-
157-
158-
#defineWEXITSTATUS(w)(((w) >> 8) & 0xff)
159-
#defineWIFEXITED(w)(((w) & 0xff) == 0)
160-
#defineWIFSIGNALED(w)(((w) & 0x7f) > 0 && (((w) & 0x7f) < 0x7f))
161-
#defineWTERMSIG(w)((w) & 0x7f)
162-
163127
/* Some extra signals */
164128
#defineSIGHUP1
165129
#defineSIGQUIT3
@@ -222,7 +186,6 @@ typedef int pid_t;
222186
/*
223187
* Supplement to <errno.h>.
224188
*/
225-
#include<errno.h>
226189
#undef EAGAIN
227190
#undef EINTR
228191
#defineEINTR WSAEINTR
@@ -237,3 +200,45 @@ typedef int pid_t;
237200
#defineECONNREFUSED WSAECONNREFUSED
238201
#defineEBADFD WSAENOTSOCK
239202
#defineEOPNOTSUPP WSAEOPNOTSUPP
203+
204+
205+
/* In backend/port/win32/signal.c */
206+
externDLLIMPORTHANDLEpgwin32_signal_event;
207+
externHANDLEpgwin32_initial_signal_pipe;
208+
209+
voidpgwin32_signal_initialize(void);
210+
HANDLEpgwin32_create_signal_listener(pid_tpid);
211+
voidpgwin32_dispatch_queued_signals(void);
212+
voidpg_queue_signal(intsignum);
213+
214+
#ifndefFRONTEND
215+
#definepg_usleep(t) pgwin32_backend_usleep(t)
216+
voidpgwin32_backend_usleep(longmicrosec);
217+
#endif
218+
219+
/* In backend/port/win32/socket.c */
220+
#ifndefFRONTEND
221+
#definesocket(af,type,protocol) pgwin32_socket(af, type, protocol)
222+
#defineaccept(s,addr,addrlen) pgwin32_accept(s, addr, addrlen)
223+
#defineconnect(s,name,namelen) pgwin32_connect(s, name, namelen)
224+
#defineselect(n,r,w,e,timeout) pgwin32_select(n, r, w, e, timeout)
225+
#definerecv(s,buf,len,flags) pgwin32_recv(s, buf, len, flags)
226+
#definesend(s,buf,len,flags) pgwin32_send(s, buf, len, flags)
227+
228+
SOCKETpgwin32_socket(intaf,inttype,intprotocol);
229+
SOCKETpgwin32_accept(SOCKETs,structsockaddr*addr,int*addrlen);
230+
intpgwin32_connect(SOCKETs,conststructsockaddr*name,intnamelen);
231+
intpgwin32_select(intnfds,fd_set*readfs,fd_set*writefds,fd_set*exceptfds,conststructtimeval*timeout);
232+
intpgwin32_recv(SOCKETs,char*buf,intlen,intflags);
233+
intpgwin32_send(SOCKETs,char*buf,intlen,intflags);
234+
235+
constchar*pgwin32_socket_strerror(interr);
236+
intpgwin32_waitforsinglesocket(SOCKETs,intwhat);
237+
238+
/* in backend/port/win32/security.c */
239+
externintpgwin32_is_admin(void);
240+
externintpgwin32_is_service(void);
241+
#endif
242+
243+
/* in backend/port/win32/error.c */
244+
externvoid_dosmaperr(unsigned long);

0 commit comments

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