Fossil SCM
merge fork
Commit
32bb8c281955af78e0d4b9621d60a31ac09bcdaf
Parent
2091a11dd8c2c20…
5 files changed
+1
-1
+4
+4
+1
-1
+2
-2
+1
-1
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -367,11 +367,11 @@ | ||
| 367 | 367 | char *z; /* General use string pointer */ |
| 368 | 368 | char **newArgv; /* New expanded g.argv under construction */ |
| 369 | 369 | char const * zFileName; /* input file name */ |
| 370 | 370 | FILE * zInFile; /* input FILE */ |
| 371 | 371 | #if defined(_WIN32) |
| 372 | - WCHAR buf[MAX_PATH]; | |
| 372 | + wchar_t buf[MAX_PATH]; | |
| 373 | 373 | #endif |
| 374 | 374 | |
| 375 | 375 | g.argc = argc; |
| 376 | 376 | g.argv = argv; |
| 377 | 377 | sqlite3_initialize(); |
| 378 | 378 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -367,11 +367,11 @@ | |
| 367 | char *z; /* General use string pointer */ |
| 368 | char **newArgv; /* New expanded g.argv under construction */ |
| 369 | char const * zFileName; /* input file name */ |
| 370 | FILE * zInFile; /* input FILE */ |
| 371 | #if defined(_WIN32) |
| 372 | WCHAR buf[MAX_PATH]; |
| 373 | #endif |
| 374 | |
| 375 | g.argc = argc; |
| 376 | g.argv = argv; |
| 377 | sqlite3_initialize(); |
| 378 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -367,11 +367,11 @@ | |
| 367 | char *z; /* General use string pointer */ |
| 368 | char **newArgv; /* New expanded g.argv under construction */ |
| 369 | char const * zFileName; /* input file name */ |
| 370 | FILE * zInFile; /* input FILE */ |
| 371 | #if defined(_WIN32) |
| 372 | wchar_t buf[MAX_PATH]; |
| 373 | #endif |
| 374 | |
| 375 | g.argc = argc; |
| 376 | g.argv = argv; |
| 377 | sqlite3_initialize(); |
| 378 |
+4
| --- src/printf.c | ||
| +++ src/printf.c | ||
| @@ -18,10 +18,14 @@ | ||
| 18 | 18 | ** This file contains implementions of routines for formatting output |
| 19 | 19 | ** (ex: mprintf()) and for output to the console. |
| 20 | 20 | */ |
| 21 | 21 | #include "config.h" |
| 22 | 22 | #include "printf.h" |
| 23 | +#if defined(_WIN32) | |
| 24 | +# include <io.h> | |
| 25 | +# include <fcntl.h> | |
| 26 | +#endif | |
| 23 | 27 | |
| 24 | 28 | /* |
| 25 | 29 | ** Conversion types fall into various categories as defined by the |
| 26 | 30 | ** following enumeration. |
| 27 | 31 | */ |
| 28 | 32 |
| --- src/printf.c | |
| +++ src/printf.c | |
| @@ -18,10 +18,14 @@ | |
| 18 | ** This file contains implementions of routines for formatting output |
| 19 | ** (ex: mprintf()) and for output to the console. |
| 20 | */ |
| 21 | #include "config.h" |
| 22 | #include "printf.h" |
| 23 | |
| 24 | /* |
| 25 | ** Conversion types fall into various categories as defined by the |
| 26 | ** following enumeration. |
| 27 | */ |
| 28 |
| --- src/printf.c | |
| +++ src/printf.c | |
| @@ -18,10 +18,14 @@ | |
| 18 | ** This file contains implementions of routines for formatting output |
| 19 | ** (ex: mprintf()) and for output to the console. |
| 20 | */ |
| 21 | #include "config.h" |
| 22 | #include "printf.h" |
| 23 | #if defined(_WIN32) |
| 24 | # include <io.h> |
| 25 | # include <fcntl.h> |
| 26 | #endif |
| 27 | |
| 28 | /* |
| 29 | ** Conversion types fall into various categories as defined by the |
| 30 | ** following enumeration. |
| 31 | */ |
| 32 |
+4
| --- src/printf.c | ||
| +++ src/printf.c | ||
| @@ -18,10 +18,14 @@ | ||
| 18 | 18 | ** This file contains implementions of routines for formatting output |
| 19 | 19 | ** (ex: mprintf()) and for output to the console. |
| 20 | 20 | */ |
| 21 | 21 | #include "config.h" |
| 22 | 22 | #include "printf.h" |
| 23 | +#if defined(_WIN32) | |
| 24 | +# include <io.h> | |
| 25 | +# include <fcntl.h> | |
| 26 | +#endif | |
| 23 | 27 | |
| 24 | 28 | /* |
| 25 | 29 | ** Conversion types fall into various categories as defined by the |
| 26 | 30 | ** following enumeration. |
| 27 | 31 | */ |
| 28 | 32 |
| --- src/printf.c | |
| +++ src/printf.c | |
| @@ -18,10 +18,14 @@ | |
| 18 | ** This file contains implementions of routines for formatting output |
| 19 | ** (ex: mprintf()) and for output to the console. |
| 20 | */ |
| 21 | #include "config.h" |
| 22 | #include "printf.h" |
| 23 | |
| 24 | /* |
| 25 | ** Conversion types fall into various categories as defined by the |
| 26 | ** following enumeration. |
| 27 | */ |
| 28 |
| --- src/printf.c | |
| +++ src/printf.c | |
| @@ -18,10 +18,14 @@ | |
| 18 | ** This file contains implementions of routines for formatting output |
| 19 | ** (ex: mprintf()) and for output to the console. |
| 20 | */ |
| 21 | #include "config.h" |
| 22 | #include "printf.h" |
| 23 | #if defined(_WIN32) |
| 24 | # include <io.h> |
| 25 | # include <fcntl.h> |
| 26 | #endif |
| 27 | |
| 28 | /* |
| 29 | ** Conversion types fall into various categories as defined by the |
| 30 | ** following enumeration. |
| 31 | */ |
| 32 |
+1
-1
| --- src/util.c | ||
| +++ src/util.c | ||
| @@ -53,11 +53,11 @@ | ||
| 53 | 53 | #if defined(_WIN32) |
| 54 | 54 | /* On windows, we have to put double-quotes around the entire command. |
| 55 | 55 | ** Who knows why - this is just the way windows works. |
| 56 | 56 | */ |
| 57 | 57 | char *zNewCmd = mprintf("\"%s\"", zOrigCmd); |
| 58 | - WCHAR *zUnicode = fossil_utf8_to_unicode(zNewCmd); | |
| 58 | + wchar_t *zUnicode = fossil_utf8_to_unicode(zNewCmd); | |
| 59 | 59 | if( g.fSystemTrace ) { |
| 60 | 60 | fossil_trace("SYSTEM: %s\n", zNewCmd); |
| 61 | 61 | } |
| 62 | 62 | rc = _wsystem(zUnicode); |
| 63 | 63 | fossil_unicode_free(zUnicode); |
| 64 | 64 |
| --- src/util.c | |
| +++ src/util.c | |
| @@ -53,11 +53,11 @@ | |
| 53 | #if defined(_WIN32) |
| 54 | /* On windows, we have to put double-quotes around the entire command. |
| 55 | ** Who knows why - this is just the way windows works. |
| 56 | */ |
| 57 | char *zNewCmd = mprintf("\"%s\"", zOrigCmd); |
| 58 | WCHAR *zUnicode = fossil_utf8_to_unicode(zNewCmd); |
| 59 | if( g.fSystemTrace ) { |
| 60 | fossil_trace("SYSTEM: %s\n", zNewCmd); |
| 61 | } |
| 62 | rc = _wsystem(zUnicode); |
| 63 | fossil_unicode_free(zUnicode); |
| 64 |
| --- src/util.c | |
| +++ src/util.c | |
| @@ -53,11 +53,11 @@ | |
| 53 | #if defined(_WIN32) |
| 54 | /* On windows, we have to put double-quotes around the entire command. |
| 55 | ** Who knows why - this is just the way windows works. |
| 56 | */ |
| 57 | char *zNewCmd = mprintf("\"%s\"", zOrigCmd); |
| 58 | wchar_t *zUnicode = fossil_utf8_to_unicode(zNewCmd); |
| 59 | if( g.fSystemTrace ) { |
| 60 | fossil_trace("SYSTEM: %s\n", zNewCmd); |
| 61 | } |
| 62 | rc = _wsystem(zUnicode); |
| 63 | fossil_unicode_free(zUnicode); |
| 64 |
+2
-2
| --- src/winhttp.c | ||
| +++ src/winhttp.c | ||
| @@ -148,11 +148,11 @@ | ||
| 148 | 148 | SOCKET s = INVALID_SOCKET; |
| 149 | 149 | SOCKADDR_IN addr; |
| 150 | 150 | int idCnt = 0; |
| 151 | 151 | int iPort = mnPort; |
| 152 | 152 | Blob options; |
| 153 | - WCHAR zTmpPath[MAX_PATH]; | |
| 153 | + wchar_t zTmpPath[MAX_PATH]; | |
| 154 | 154 | |
| 155 | 155 | if( zStopper ) file_delete(zStopper); |
| 156 | 156 | blob_zero(&options); |
| 157 | 157 | if( zNotFound ){ |
| 158 | 158 | blob_appendf(&options, " --notfound %s", zNotFound); |
| @@ -261,11 +261,11 @@ | ||
| 261 | 261 | int port; /* Port on which the http server should run */ |
| 262 | 262 | const char *zNotFound; /* The --notfound option, or NULL */ |
| 263 | 263 | const char *zFileGlob; /* The --files option, or NULL */ |
| 264 | 264 | int flags; /* One or more HTTP_SERVER_ flags */ |
| 265 | 265 | int isRunningAsService; /* Are we running as a service ? */ |
| 266 | - const WCHAR *zServiceName;/* Name of the service */ | |
| 266 | + const wchar_t *zServiceName;/* Name of the service */ | |
| 267 | 267 | SOCKET s; /* Socket on which the http server listens */ |
| 268 | 268 | }; |
| 269 | 269 | |
| 270 | 270 | /* |
| 271 | 271 | ** Variables used for running as windows service. |
| 272 | 272 |
| --- src/winhttp.c | |
| +++ src/winhttp.c | |
| @@ -148,11 +148,11 @@ | |
| 148 | SOCKET s = INVALID_SOCKET; |
| 149 | SOCKADDR_IN addr; |
| 150 | int idCnt = 0; |
| 151 | int iPort = mnPort; |
| 152 | Blob options; |
| 153 | WCHAR zTmpPath[MAX_PATH]; |
| 154 | |
| 155 | if( zStopper ) file_delete(zStopper); |
| 156 | blob_zero(&options); |
| 157 | if( zNotFound ){ |
| 158 | blob_appendf(&options, " --notfound %s", zNotFound); |
| @@ -261,11 +261,11 @@ | |
| 261 | int port; /* Port on which the http server should run */ |
| 262 | const char *zNotFound; /* The --notfound option, or NULL */ |
| 263 | const char *zFileGlob; /* The --files option, or NULL */ |
| 264 | int flags; /* One or more HTTP_SERVER_ flags */ |
| 265 | int isRunningAsService; /* Are we running as a service ? */ |
| 266 | const WCHAR *zServiceName;/* Name of the service */ |
| 267 | SOCKET s; /* Socket on which the http server listens */ |
| 268 | }; |
| 269 | |
| 270 | /* |
| 271 | ** Variables used for running as windows service. |
| 272 |
| --- src/winhttp.c | |
| +++ src/winhttp.c | |
| @@ -148,11 +148,11 @@ | |
| 148 | SOCKET s = INVALID_SOCKET; |
| 149 | SOCKADDR_IN addr; |
| 150 | int idCnt = 0; |
| 151 | int iPort = mnPort; |
| 152 | Blob options; |
| 153 | wchar_t zTmpPath[MAX_PATH]; |
| 154 | |
| 155 | if( zStopper ) file_delete(zStopper); |
| 156 | blob_zero(&options); |
| 157 | if( zNotFound ){ |
| 158 | blob_appendf(&options, " --notfound %s", zNotFound); |
| @@ -261,11 +261,11 @@ | |
| 261 | int port; /* Port on which the http server should run */ |
| 262 | const char *zNotFound; /* The --notfound option, or NULL */ |
| 263 | const char *zFileGlob; /* The --files option, or NULL */ |
| 264 | int flags; /* One or more HTTP_SERVER_ flags */ |
| 265 | int isRunningAsService; /* Are we running as a service ? */ |
| 266 | const wchar_t *zServiceName;/* Name of the service */ |
| 267 | SOCKET s; /* Socket on which the http server listens */ |
| 268 | }; |
| 269 | |
| 270 | /* |
| 271 | ** Variables used for running as windows service. |
| 272 |