C comments: remove odd blank lines after #ifdef WIN32 lines

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 141edf43278baef8ae257c9238db54bdbe8a5311..5f3c3b9be1ecd493e4840dced87f9a056ee640a8 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -4182,7 +4182,6 @@ RemoveOldXlogFiles(XLogSegNo segno, XLogRecPtr endptr)
                                                                        xlde->d_name)));
 
 #ifdef WIN32
-
                                        /*
                                         * On Windows, if another process (e.g another backend)
                                         * holds the file open in FILE_SHARE_DELETE mode, unlink

diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index 2b247932ac1fe9784ccdcbfc12a469bf51aa4410..1eae183e33a71ecca141e1b1563b4d7b4a5c0a0b 100644 (file)
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -692,7 +692,6 @@ StreamConnection(pgsocket server_fd, Port *port)
                }
 
 #ifdef WIN32
-
                /*
                 * This is a Win32 socket optimization.  The ideal size is 32k.
                 * http://support.microsoft.com/kb/823764/EN-US/

diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index 98da177de94e38e0fd16cf16d065ba773be7011d..a8ab4c4ab6f64056e64682aa2d19e7c29ef933a0 100644 (file)
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -107,7 +107,6 @@ main(int argc, char *argv[])
        set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("postgres"));
 
 #ifdef WIN32
-
        /*
         * Windows uses codepages rather than the environment, so we work around
         * that by querying the environment explicitly first for LC_COLLATE and
@@ -183,7 +182,6 @@ main(int argc, char *argv[])
 #endif
 
 #ifdef WIN32
-
        /*
         * Start our win32 signal implementation
         *

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 5db01d104a15d63fb348641f567061c49bee2ec7..e9072b76efcfa11107a19b64db7462c557a8efe5 100644 (file)
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -1063,7 +1063,6 @@ PostmasterMain(int argc, char *argv[])
        InitPostmasterDeathWatchHandle();
 
 #ifdef WIN32
-
        /*
         * Initialize I/O completion port used to deliver list of dead children.
         */
@@ -2929,8 +2928,8 @@ CleanupBackend(int pid,
         * assume everything is all right and proceed to remove the backend from
         * the active backend list.
         */
-#ifdef WIN32
 
+#ifdef WIN32
        /*
         * On win32, also treat ERROR_WAIT_NO_CHILDREN (128) as nonfatal case,
         * since that sometimes happens under load when the process fails to start

diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 2918f75c0eb89bd3bd2fe533653a803b30d2dd27..4dc809dc01d97deead258a0ae7ad6af100eae3fa 100644 (file)
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -1957,7 +1957,6 @@ ReadDir(DIR *dir, const char *dirname)
                return dent;
 
 #ifdef WIN32
-
        /*
         * This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in
         * released version

diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c
index f34446329f580d9234f8098ac8627a6aa6b831de..0c8474df54a49938ba839a4a714de38aa5bdefc0 100644 (file)
--- a/src/backend/utils/adt/pg_locale.c
+++ b/src/backend/utils/adt/pg_locale.c
@@ -463,7 +463,6 @@ PGLC_localeconv(void)
                save_lc_numeric = pstrdup(save_lc_numeric);
 
 #ifdef WIN32
-
        /*
         * Ideally, monetary and numeric local symbols could be returned in any
         * server encoding.  Unfortunately, the WIN32 API does not allow
@@ -645,7 +644,6 @@ cache_locale_time(void)
                save_lc_time = pstrdup(save_lc_time);
 
 #ifdef WIN32
-
        /*
         * On WIN32, there is no way to get locale-specific time values in a
         * 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)
                return 0;
 
 #ifdef WIN32
-
        /*
         * On Windows, the "Unicode" locales assume UTF16 not UTF8 encoding, and
         * for some reason mbstowcs and wcstombs won't do this for us, so we use

diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index 5ca3c0241bc8860472942627cdc38320bde21fb3..1ffc0160b77f9b8304179f092a38f31e65b1f21f 100644 (file)
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -3950,7 +3950,6 @@ convert_string_datum(Datum value, Oid typid)
                xfrmlen = strxfrm(NULL, val, 0);
 #endif
 #ifdef WIN32
-
                /*
                 * On Windows, strxfrm returns INT_MAX when an error occurs. Instead
                 * of trying to allocate this much memory (and fail), just return the

diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index d28b74941152673d9d24c51af267fe788c121e6a..3668d16161078388009a95ad98c9a82778f366e5 100644 (file)
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -2057,7 +2057,6 @@ write_console(const char *line, int len)
        int                     rc;
 
 #ifdef WIN32
-
        /*
         * Try to convert the message to UTF16 and write it with WriteConsoleW().
         * Fall back on write() if anything fails.
@@ -2887,7 +2886,6 @@ send_message_to_server_log(ErrorData *edata)
                if (redirection_done && !am_syslogger)
                        write_pipe_chunks(buf.data, buf.len, LOG_DESTINATION_STDERR);
 #ifdef WIN32
-
                /*
                 * In a win32 service environment, there is no usable stderr. Capture
                 * anything going there and write it to the eventlog instead.

diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index a7d5f7a153b571777afe84d9df8e9b0ee020b773..44231273fafbfefad18093f900a2b3b2eef148a8 100644 (file)
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -2891,7 +2891,6 @@ void
 get_restricted_token(void)
 {
 #ifdef WIN32
-
        /*
         * Before we execute another program, make sure that we are running with a
         * restricted token. If not, re-execute ourselves with one.

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 1f0eeaf4c601dd9730e62b99843fb9d2bf3a22f7..dedb6e74f132a893183acadacd8dc7164cfe6930 100644 (file)
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -2667,7 +2667,6 @@ makeEmptyPGconn(void)
        PGconn     *conn;
 
 #ifdef WIN32
-
        /*
         * Make sure socket support is up and running.
         */

diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index f8ccaa59e8930080a05ebb8f279552aa4011cc08..e91b71e7779eb8bfa4cb27f30e2ebc2bbdb6d809 100644 (file)
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -697,7 +697,6 @@ plperl_init_interp(void)
        int                     nargs = 3;
 
 #ifdef WIN32
-
        /*
         * The perl library on startup does horrible things like call
         * setlocale(LC_ALL,""). We have protected against that on most platforms

diff --git a/src/port/getaddrinfo.c b/src/port/getaddrinfo.c
index e6ff1cdc117fd80c4b0e97d0cf9cc5689654cee5..52a20c5c2ccfef56224229633f6305b0c099b57e 100644 (file)
--- a/src/port/getaddrinfo.c
+++ b/src/port/getaddrinfo.c
@@ -144,7 +144,6 @@ getaddrinfo(const char *node, const char *service,
        struct addrinfo hints;
 
 #ifdef WIN32
-
        /*
         * If Windows has native IPv6 support, use the native Windows routine.
         * Otherwise, fall through and use our own code.
@@ -267,7 +266,6 @@ freeaddrinfo(struct addrinfo * res)
        if (res)
        {
 #ifdef WIN32
-
                /*
                 * If Windows has native IPv6 support, use the native Windows routine.
                 * Otherwise, fall through and use our own code.
@@ -359,7 +357,6 @@ getnameinfo(const struct sockaddr * sa, int salen,
                        char *service, int servicelen, int flags)
 {
 #ifdef WIN32
-
        /*
         * If Windows has native IPv6 support, use the native Windows routine.
         * Otherwise, fall through and use our own code.

diff --git a/src/port/getrusage.c b/src/port/getrusage.c
index a29ae8b6d3620c65c443e21983ac4692e761faa8..9e39e027d8a78a15a27b49d8fb092bc47c7e6955 100644 (file)
--- a/src/port/getrusage.c
+++ b/src/port/getrusage.c
@@ -32,7 +32,6 @@ int
 getrusage(int who, struct rusage * rusage)
 {
 #ifdef WIN32
-
        FILETIME        starttime;
        FILETIME        exittime;
        FILETIME        kerneltime;

diff --git a/src/port/path.c b/src/port/path.c
index 8765907a57f41823f4a7987c1f856c3b8513e9c6..39d6e43404a65eca8b41de7ead942ba04c709bbb 100644 (file)
--- a/src/port/path.c
+++ b/src/port/path.c
@@ -222,7 +222,6 @@ canonicalize_path(char *path)
        int                     pending_strips;
 
 #ifdef WIN32
-
        /*
         * The Windows command processor will accept suitably quoted paths with
         * forward slashes, but barfs badly with mixed forward and back slashes.
@@ -372,7 +371,6 @@ path_is_relative_and_below_cwd(const char *path)
        else if (path_contains_parent_reference(path))
                return false;
 #ifdef WIN32
-
        /*
         * On Win32, a drive letter _not_ followed by a slash, e.g. 'E:abc', is
         * relative to the cwd on that drive, or the drive's root directory if

diff --git a/src/port/sprompt.c b/src/port/sprompt.c
index 38d7628a6055bc66d390b537a2037f1e4064a5b7..4120acf914a3727ac4c2e7ec023a1c46f954e78c 100644 (file)
--- a/src/port/sprompt.c
+++ b/src/port/sprompt.c
@@ -57,7 +57,6 @@ simple_prompt(const char *prompt, int maxlen, bool echo)
                return NULL;
 
 #ifdef WIN32
-
        /*
         * A Windows console has an "input code page" and an "output code page";
         * 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)
 #endif
        if (!termin || !termout
 #ifdef WIN32
-
        /*
         * Direct console I/O does not work from the MSYS 1.0.10 console.  Writes
         * reach nowhere user-visible; reads block indefinitely.  XXX This affects

diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 475a11a7f6fb1f292b971645e3ffe9b83c2dd34d..abde5b477c670068e051315e04650af365b2a92f 100644 (file)
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -438,7 +438,6 @@ convert_sourcefiles_in(char *source_subdir, char *dest_dir, char *dest_subdir, c
        snprintf(testtablespace, MAXPGPATH, "%s/testtablespace", outputdir);
 
 #ifdef WIN32
-
        /*
         * On Windows only, clean out the test tablespace dir, or create it if it
         * 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)
                exit(2);
        }
 #ifdef WIN32
-
        /*
         * On WIN32, if the 'diff' command cannot be found, system() returns 1,
         * but produces nothing to stdout, so we check for that here.

diff --git a/src/timezone/zic.c b/src/timezone/zic.c
index cda704266add2b2878c9f924464dd484204e46b5..c6a811e018bf688e8b08bd068a0bd3757fff3370 100644 (file)
--- a/src/timezone/zic.c
+++ b/src/timezone/zic.c
@@ -2848,7 +2848,6 @@ mkdirs(char *argname)
        {
                *cp = '\0';
 #ifdef WIN32
-
                /*
                 * DOS drive specifier?
                 */