Changes On Branch jn-mingw-w64-compiler-warnings
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Changes In Branch jn-mingw-w64-compiler-warnings Excluding Merge-Ins

This is equivalent to a diff from 2b1767500e to b5d69afed7

2012-08-21
14:15
Merge the mingw-w64 compiler warning fixes into trunk. check-in: d89b99e383 user: drh tags: trunk
11:18
In file included from /usr/x86_64-w64-mingw32/sys-root/mingw/include/ws2tcpip.h:11:0, from src/cgi.c:29: /usr/x86_64-w64-mingw32/sys-root/mingw/include/winsock2.h:15:2: warning: #warning Please include winsock2.h before windows.h src/file.c:47:0: warning: "stat" redefined /usr/x86_64-w64-mingw32/sys-root/mingw/include/sys/stat.h:25... Closed-Leaf check-in: b5d69afed7 user: jan.nijtmans tags: jn-mingw-w64-compiler-warnings
11:05
Fix error messages associated with the "scrub" command. check-in: e25f55dd4d user: drh tags: trunk
2012-08-20
19:01
Expand the "diffFlags" variable to 64-bits in order to accommodate new options to the various "diff" commands. check-in: 2b1767500e user: drh tags: trunk
2012-08-19
09:45
Added bash auto-completion script from Stuart Rackham. check-in: 85f1856c95 user: stephan tags: trunk

Changes to src/cgi.c.

    19     19   ** services to CGI programs.  There are procedures for parsing and
    20     20   ** dispensing QUERY_STRING parameters and cookies, the "mprintf()"
    21     21   ** formatting function and its cousins, and routines to encode and
    22     22   ** decode strings in HTML or HTTP.
    23     23   */
    24     24   #include "config.h"
    25     25   #ifdef _WIN32
    26         -# include <windows.h>           /* for Sleep once server works again */
    27     26   #  if defined(__MINGW32__)
    28         -#    define sleep Sleep            /* windows does not have sleep, but Sleep */
    29         -#    include <ws2tcpip.h>          
           27  +#    include <ws2tcpip.h>
    30     28   #  endif
           29  +#  include <windows.h>           /* for Sleep once server works again */
           30  +#  define sleep Sleep            /* windows does not have sleep, but Sleep */
    31     31   #else
    32     32   # include <sys/socket.h>
    33     33   # include <netinet/in.h>
    34     34   # include <arpa/inet.h>
    35     35   # include <sys/times.h>
    36     36   # include <sys/time.h>
    37     37   # include <sys/wait.h>

Changes to src/file.c.

    40     40   /*
    41     41   ** The file status information from the most recent stat() call.
    42     42   **
    43     43   ** Use _stati64 rather than stat on windows, in order to handle files
    44     44   ** larger than 2GB.
    45     45   */
    46     46   #if defined(_WIN32) && (defined(__MSVCRT__) || defined(_MSC_VER))
           47  +# undef stat
    47     48   # define stat _stati64
    48     49   #endif
    49     50   /*
    50     51   ** On Windows S_ISLNK always returns FALSE.
    51     52   */
    52     53   #if defined(_WIN32)
    53     54   # define S_ISLNK(x) (0)

Changes to src/http_socket.c.

    25     25   ** Low-level sockets are abstracted out into this module because they 
    26     26   ** are handled different on Unix and windows.
    27     27   */
    28     28   
    29     29   #include "config.h"
    30     30   #include "http_socket.h"
    31     31   #if defined(_WIN32)
    32         -#  include <windows.h>           /* for Sleep once server works again */
    33         -#  define sleep Sleep            /* windows does not have sleep, but Sleep */
    34     32   #  if defined(__MINGW32__)
    35     33   #    include <ws2tcpip.h>          
    36     34   #  endif
           35  +#  include <windows.h>           /* for Sleep once server works again */
           36  +#  define sleep Sleep            /* windows does not have sleep, but Sleep */
    37     37   #else
    38     38   #  include <netinet/in.h>
    39     39   #  include <arpa/inet.h>
    40     40   #  include <sys/socket.h>
    41     41   #  include <netdb.h>
    42     42   #endif
    43     43   #include <assert.h>

Changes to src/shell.c.

    60     60   # define stifle_history(X)
    61     61   #endif
    62     62   
    63     63   #if defined(_WIN32) || defined(WIN32)
    64     64   # include <io.h>
    65     65   #define isatty(h) _isatty(h)
    66     66   #define access(f,m) _access((f),(m))
           67  +#undef popen
    67     68   #define popen(a,b) _popen((a),(b))
           69  +#undef pclose
    68     70   #define pclose(x) _pclose(x)
    69     71   #else
    70     72   /* Make sure isatty() has a prototype.
    71     73   */
    72     74   extern int isatty(int);
    73     75   #endif
    74     76