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

Commit886c0be

Browse files
committed
C comments: remove odd blank lines after #ifdef WIN32 lines
1 parenta3115f0 commit886c0be

File tree

17 files changed

+1
-27
lines changed

17 files changed

+1
-27
lines changed

‎src/backend/access/transam/xlog.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4182,7 +4182,6 @@ RemoveOldXlogFiles(XLogSegNo segno, XLogRecPtr endptr)
41824182
xlde->d_name)));
41834183

41844184
#ifdefWIN32
4185-
41864185
/*
41874186
* On Windows, if another process (e.g another backend)
41884187
* holds the file open in FILE_SHARE_DELETE mode, unlink

‎src/backend/libpq/pqcomm.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,6 @@ StreamConnection(pgsocket server_fd, Port *port)
692692
}
693693

694694
#ifdefWIN32
695-
696695
/*
697696
* This is a Win32 socket optimization. The ideal size is 32k.
698697
* http://support.microsoft.com/kb/823764/EN-US/

‎src/backend/main/main.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ main(int argc, char *argv[])
107107
set_pglocale_pgservice(argv[0],PG_TEXTDOMAIN("postgres"));
108108

109109
#ifdefWIN32
110-
111110
/*
112111
* Windows uses codepages rather than the environment, so we work around
113112
* that by querying the environment explicitly first for LC_COLLATE and
@@ -183,7 +182,6 @@ main(int argc, char *argv[])
183182
#endif
184183

185184
#ifdefWIN32
186-
187185
/*
188186
* Start our win32 signal implementation
189187
*

‎src/backend/postmaster/postmaster.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,7 +1063,6 @@ PostmasterMain(int argc, char *argv[])
10631063
InitPostmasterDeathWatchHandle();
10641064

10651065
#ifdefWIN32
1066-
10671066
/*
10681067
* Initialize I/O completion port used to deliver list of dead children.
10691068
*/
@@ -2929,8 +2928,8 @@ CleanupBackend(int pid,
29292928
* assume everything is all right and proceed to remove the backend from
29302929
* the active backend list.
29312930
*/
2932-
#ifdefWIN32
29332931

2932+
#ifdefWIN32
29342933
/*
29352934
* On win32, also treat ERROR_WAIT_NO_CHILDREN (128) as nonfatal case,
29362935
* since that sometimes happens under load when the process fails to start

‎src/backend/storage/file/fd.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1957,7 +1957,6 @@ ReadDir(DIR *dir, const char *dirname)
19571957
returndent;
19581958

19591959
#ifdefWIN32
1960-
19611960
/*
19621961
* This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in
19631962
* released version

‎src/backend/utils/adt/pg_locale.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,6 @@ PGLC_localeconv(void)
463463
save_lc_numeric=pstrdup(save_lc_numeric);
464464

465465
#ifdefWIN32
466-
467466
/*
468467
* Ideally, monetary and numeric local symbols could be returned in any
469468
* server encoding. Unfortunately, the WIN32 API does not allow
@@ -645,7 +644,6 @@ cache_locale_time(void)
645644
save_lc_time=pstrdup(save_lc_time);
646645

647646
#ifdefWIN32
648-
649647
/*
650648
* On WIN32, there is no way to get locale-specific time values in a
651649
* specified locale, like we do for monetary/numeric. We can only get
@@ -1172,7 +1170,6 @@ wchar2char(char *to, const wchar_t *from, size_t tolen, pg_locale_t locale)
11721170
return0;
11731171

11741172
#ifdefWIN32
1175-
11761173
/*
11771174
* On Windows, the "Unicode" locales assume UTF16 not UTF8 encoding, and
11781175
* for some reason mbstowcs and wcstombs won't do this for us, so we use

‎src/backend/utils/adt/selfuncs.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3950,7 +3950,6 @@ convert_string_datum(Datum value, Oid typid)
39503950
xfrmlen=strxfrm(NULL,val,0);
39513951
#endif
39523952
#ifdefWIN32
3953-
39543953
/*
39553954
* On Windows, strxfrm returns INT_MAX when an error occurs. Instead
39563955
* of trying to allocate this much memory (and fail), just return the

‎src/backend/utils/error/elog.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2057,7 +2057,6 @@ write_console(const char *line, int len)
20572057
intrc;
20582058

20592059
#ifdefWIN32
2060-
20612060
/*
20622061
* Try to convert the message to UTF16 and write it with WriteConsoleW().
20632062
* Fall back on write() if anything fails.
@@ -2887,7 +2886,6 @@ send_message_to_server_log(ErrorData *edata)
28872886
if (redirection_done&& !am_syslogger)
28882887
write_pipe_chunks(buf.data,buf.len,LOG_DESTINATION_STDERR);
28892888
#ifdefWIN32
2890-
28912889
/*
28922890
* In a win32 service environment, there is no usable stderr. Capture
28932891
* anything going there and write it to the eventlog instead.

‎src/bin/initdb/initdb.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2891,7 +2891,6 @@ void
28912891
get_restricted_token(void)
28922892
{
28932893
#ifdefWIN32
2894-
28952894
/*
28962895
* Before we execute another program, make sure that we are running with a
28972896
* restricted token. If not, re-execute ourselves with one.

‎src/interfaces/libpq/fe-connect.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2667,7 +2667,6 @@ makeEmptyPGconn(void)
26672667
PGconn*conn;
26682668

26692669
#ifdefWIN32
2670-
26712670
/*
26722671
* Make sure socket support is up and running.
26732672
*/

‎src/pl/plperl/plperl.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,6 @@ plperl_init_interp(void)
697697
intnargs=3;
698698

699699
#ifdefWIN32
700-
701700
/*
702701
* The perl library on startup does horrible things like call
703702
* setlocale(LC_ALL,""). We have protected against that on most platforms

‎src/port/getaddrinfo.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ getaddrinfo(const char *node, const char *service,
144144
structaddrinfohints;
145145

146146
#ifdefWIN32
147-
148147
/*
149148
* If Windows has native IPv6 support, use the native Windows routine.
150149
* Otherwise, fall through and use our own code.
@@ -267,7 +266,6 @@ freeaddrinfo(struct addrinfo * res)
267266
if (res)
268267
{
269268
#ifdefWIN32
270-
271269
/*
272270
* If Windows has native IPv6 support, use the native Windows routine.
273271
* Otherwise, fall through and use our own code.
@@ -359,7 +357,6 @@ getnameinfo(const struct sockaddr * sa, int salen,
359357
char*service,intservicelen,intflags)
360358
{
361359
#ifdefWIN32
362-
363360
/*
364361
* If Windows has native IPv6 support, use the native Windows routine.
365362
* Otherwise, fall through and use our own code.

‎src/port/getrusage.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ int
3232
getrusage(intwho,structrusage*rusage)
3333
{
3434
#ifdefWIN32
35-
3635
FILETIMEstarttime;
3736
FILETIMEexittime;
3837
FILETIMEkerneltime;

‎src/port/path.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@ canonicalize_path(char *path)
222222
intpending_strips;
223223

224224
#ifdefWIN32
225-
226225
/*
227226
* The Windows command processor will accept suitably quoted paths with
228227
* forward slashes, but barfs badly with mixed forward and back slashes.
@@ -372,7 +371,6 @@ path_is_relative_and_below_cwd(const char *path)
372371
elseif (path_contains_parent_reference(path))
373372
return false;
374373
#ifdefWIN32
375-
376374
/*
377375
* On Win32, a drive letter _not_ followed by a slash, e.g. 'E:abc', is
378376
* relative to the cwd on that drive, or the drive's root directory if

‎src/port/sprompt.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ simple_prompt(const char *prompt, int maxlen, bool echo)
5757
returnNULL;
5858

5959
#ifdefWIN32
60-
6160
/*
6261
* A Windows console has an "input code page" and an "output code page";
6362
* these usually match each other, but they rarely match the "Windows ANSI
@@ -86,7 +85,6 @@ simple_prompt(const char *prompt, int maxlen, bool echo)
8685
#endif
8786
if (!termin|| !termout
8887
#ifdefWIN32
89-
9088
/*
9189
* Direct console I/O does not work from the MSYS 1.0.10 console. Writes
9290
* reach nowhere user-visible; reads block indefinitely. XXX This affects

‎src/test/regress/pg_regress.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,6 @@ convert_sourcefiles_in(char *source_subdir, char *dest_dir, char *dest_subdir, c
438438
snprintf(testtablespace,MAXPGPATH,"%s/testtablespace",outputdir);
439439

440440
#ifdefWIN32
441-
442441
/*
443442
* On Windows only, clean out the test tablespace dir, or create it if it
444443
* doesn't exist. On other platforms we expect the Makefile to take care
@@ -1195,7 +1194,6 @@ run_diff(const char *cmd, const char *filename)
11951194
exit(2);
11961195
}
11971196
#ifdefWIN32
1198-
11991197
/*
12001198
* On WIN32, if the 'diff' command cannot be found, system() returns 1,
12011199
* but produces nothing to stdout, so we check for that here.

‎src/timezone/zic.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2848,7 +2848,6 @@ mkdirs(char *argname)
28482848
{
28492849
*cp='\0';
28502850
#ifdefWIN32
2851-
28522851
/*
28532852
* DOS drive specifier?
28542853
*/

0 commit comments

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