Compare commits

...

3 Commits

Author SHA1 Message Date
icculus d872b033bb Lemon: Fixed compiler warning on Visual C++.
FossilOrigin-Name: 892c5f377a983fb440f421b08864780d4d4834e5
2010-11-19 04:22:05 +00:00
icculus 32e9810d6e Lemon: correcting previous win32 access() fix.
The previous fix caused link errors when compiled as C++.

FossilOrigin-Name: bd03d3331dc7cb122175370d9e27dca57f42c561
2010-11-19 04:19:41 +00:00
icculus e6db5faaf4 Lemon: Patched to compile with Visual Studio.
FossilOrigin-Name: 0b945101aa4e70f2f6dd389db57bd2e503bdbb41
2010-11-19 03:55:52 +00:00
3 changed files with 28 additions and 22 deletions
+19 -19
View File
@@ -1,8 +1,8 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
C Fixed\scompiler\swarning\son\sVisual\sStudio.
D 2010-03-03T17:09:01
C Lemon:\sFixed\scompiler\swarning\son\sVisual\sC++.
D 2010-11-19T04:22:05
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -770,7 +770,7 @@ F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
F tool/fragck.tcl 5265a95126abcf6ab357f7efa544787e5963f439
F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4
F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
F tool/lemon.c 6958cb9935be265bf51dbc718ef325e3b77685b6
F tool/lemon.c aaf110d0f4709c6784aae13c126dc175515fb3cb
F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc
F tool/mkkeywordhash.c d2e6b4a5965e23afb80fbe74bb54648cd371f309
F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
@@ -795,24 +795,24 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P 643728003218c9841425dffb6fe506763859fd37
R 88162007d47a23ce8840be57770bbe94
P bd03d3331dc7cb122175370d9e27dca57f42c561
R d99c7302dbce7a4e395a73557bd44081
U icculus
Z 5062e0d6c2809b73b8e0e67b25c9222f
Z 20a5c7786d03756134c5136266a20a47
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.14 (Darwin)
iQIcBAEBAgAGBQJLjpetAAoJEDDcKcGyC63VEzEQAKFGgN98bElxiUheG0Y+nIug
6LqhN/lZAznL1q4t1TgJdHBtsZnBEtEzz0qmjneq68i2WRqADJAaavoqpgwuaoo8
U6RhPJMxO/40OUNangbj9dPFZRpkPepGWr3akOGR+0EldIcdoD6j4qRpB33Sz8BK
lc27s2tXtv3MgOnpYaONkjiOLeGj9K6OQJ6jwQoWMSwLbF2M1iZz6q1PS6teS0qw
awfNOBpugn3PVES47ePR2+s7/4rzL/AiAlUBmcr9B7MdIO29p5hVktKizx53OYyd
bueKRyH1KxIOGQdo/VBKJejF1eVcz+XnICwT1rytx46EB0AI6Y/F94SYoJETdkP3
XXgC5zzVxKVdjlHdqWbdYCKLNIfLQvUH+DJkchOO817YjEKeb36zlyNQePup+qm8
17jxHYejWiHKvB3/tjHo2WgJasaDjyLhe4h7w2/UBx2rkKtR3W3eta/guljwnQ+C
GexcgCzxS1QzwNB1F6+Awpu2P2fkN1l4Vmxg5aNGU6br4zntNKgTedDD7tVfUHVW
L8uPJBH0NCMgWHRKMcWSZvLSEZTY5A5OKgpteoIKHq23bTYNEBnYIsd6Qy7sF4Ez
3eBwLKqOIzh687Nq2OJ5mzgeuGIlrfTaaek06d3gHCmeCKCUaIwElaz2r1pn+AgT
8Ht2heYwOrxkQbqQA0Iv
=gus5
iQIcBAEBAgAGBQJM5fttAAoJEDDcKcGyC63VgY4P/1/kRnFgqqdfy/2x68X3fwF0
kMNXRyuI2YhzHVEO7YVm+3vUDOxgZzDoTr3ta8Qf5htt1kiylC6IbJQtdp7qbQQV
CnRVbecCka92nXtPwIAXMUemFTmHGeekA51a9jkEzs2sXUOo9NRXmpvM10UhEZyg
hIwKT+7QSCp+zolna3jm0E3VEFiRNaYatjKvC9iFRMUILouQl2wtp8kWEjl8atF+
uhvYQHci62vRMk9DPs1VLBYAiAMNFRiPvmIHs5UBvk6eFIk/H0QfE7faexYXOJEe
Gof1ySiwGzsRGdeeaObNUECjc8WC33IihUAHxlQGnaVnbXSSO/zTMllBfVpFtNaz
9erSiKpunXnFCfhgv8Sb3OnTE1OUyunktsg+SNFuvH/8rMasOn0QkuiDQZAlbO8t
p5s+cfsfSI81D8q2YfTFGQm3gu1tQ6pmMOfAUUbmzIvsYdpsHvHNR/jMBxQNLyir
KPaSuZR3bHO3KeZwXsu/sR9vhuOeF38bY7PADUevBYP2h3cCupiNSwx3rs0Sz0kJ
CqPNanOa6owM6D5Tqwu3nXgQTlkb2YwV/qloo7Rpuyn3xyZ6F5jgjGGn9X2vdTK2
ZXL1SPIhRZNWFn+HVA2lULfZWA0hQaIFtrdaDdaWWhzm3xc6G2rrlRFwX4SRmcA5
ShQiHXCxoxqxXafFQL6F
=zfyu
-----END PGP SIGNATURE-----
+1 -1
View File
@@ -1 +1 @@
83495128c820e963c70d11c3196f81d8cf01f867
892c5f377a983fb440f421b08864780d4d4834e5
+8 -2
View File
@@ -20,7 +20,13 @@
#endif
#ifdef __WIN32__
extern int access();
#ifdef __cplusplus
extern "C" {
#endif
extern int access(const char *path, int mode);
#ifdef __cplusplus
}
#endif
#else
#include <unistd.h>
#endif
@@ -3243,7 +3249,7 @@ PRIVATE char *append_str(const char *zText, int n, int p1, int p2){
}
n = lemonStrlen(zText);
}
if( n+sizeof(zInt)*2+used >= alloced ){
if( (int) (n+sizeof(zInt)*2+used) >= alloced ){
alloced = n + sizeof(zInt)*2 + used + 200;
z = (char *) realloc(z, alloced);
}