Lemon: correcting previous win32 access() fix.

The previous fix caused link errors when compiled as C++.

FossilOrigin-Name: bd03d3331dc7cb122175370d9e27dca57f42c561

diff --git a/manifest b/manifest
index 6e3254a3029ed5372f8405d23bd1939820e1d5b9..8e527f96c82f79639820dfd0e655d9cec999ec6b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Lemon:\sPatched\sto\scompile\swith\sVisual\sStudio.
-D 2010-11-19T03:55:53
+C Lemon:\scorrecting\sprevious\swin32\saccess()\sfix.\n\nThe\sprevious\sfix\scaused\slink\serrors\swhen\scompiled\sas\sC++.
+D 2010-11-19T04:19:41
 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 0fd01011bf19113ee50347cd510659b9c28051a5
+F tool/lemon.c f94ea13aa4ae6fe7340fce5c637463b37143afce
 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 83495128c820e963c70d11c3196f81d8cf01f867
-R a05e9239b70e5c9f4987302315cc55a0
+P 0b945101aa4e70f2f6dd389db57bd2e503bdbb41
+R 976f9b21b3fff0197947dfd32c65e5db
 U icculus
-Z fd3f5d3e69bd2c090ed5f29ce3deb673
+Z 1b5d5e155167c7c36ab057602353baea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG/MacGPG2 v2.0.14 (Darwin)
 
-iQIcBAEBAgAGBQJM5fVRAAoJEDDcKcGyC63V8+8P/0EyJzKZbAcOZsVgEQcl5+d3
-75awFenMsZs28t5+EH9Sbuq1CPaGc2yu86oHTc2fg8HH+MM/8OBsUZdXQpMLspIl
-nRiudIKlILUcV4sUD041aNktll5maZj8POe8P87PfjMorTpKGDn1iPdAE+kD+iLE
-VIgMo4K540H79GYlkqDPwnrJWI5zh9jR9pSlbvzGtLvwIgb3rKasdXjj7iYlN2QK
-o4bzAjlbBc2aqHPtmD1Yxq70G+uVnKh159c/IV2+2jFc5oZlEh+a1m2ec1v7AgRk
-VbdQnt/BvS+Yx2djrf6nIBJUpEJWSNLWKvaTiIK1xYZG/spoIBCtQQWmE04rD46p
-PgkfRUPCzXq9dABKFfXJVQl7Oq0v48JTutI/8ICdiP9iEASa6G26lBycnBbR9Blo
-G2RNICG/ZDprC0NtaRG+hPnjOvl0vjDTqTK6ybivjqIa9aZXqq7J+zTiPOmtGKy8
-8GfRn71DADFT/oy6EyzBauZIuxVCedZ5oVgMlEf6CafybH4Tar8XwcjM1YjRVeor
-Gxt1Zeb2A308gZ62hbOukiS6Yp90IyWMCGqvcr9d06DGoWr/M5Z+MVQ00qhgHHoD
-slCw9IiODPXb+2Yy+O4u9rLZmV28e5Ja4n8YdY6gl/oTC+UOcKPoz75UeFhO+eXa
-lsgjovj5g42r33ns5BuZ
-=Cs3V
+iQIcBAEBAgAGBQJM5friAAoJEDDcKcGyC63VdUEQAIUm3o+X7Y8K4h93I26gOp8r
+FTVtgmAj+wwtheQUtqS5kYwf8BHiqE6EP6Atd4tWDaqRIEF4uGWh9L3qd7CWExFw
+HzoDHJnS14ojTNcfUnp0b6jZOTPd8FfzGmHU7gR6iQrn9fdmbdvDeoqDBDqL9FOA
+ympJlVCCp7AjHVrs6WNhiKhVLdbFA1IUPE4QVg8mX4Ae4IBTa0fu2wGSDXKJjzMv
+HD2KZ/QcuuncYG2maYvDQc9uA+dw166YJDqmrec18m6jY2UczoBeOui725+Lpenb
+W06SKV/AhiOZXiIDrMeLZplsuiH7C+gw4TgcN6wxAM4y+L2P60j7eCzZCfyF2QeD
+WPtxdI3HbYpfOmwxGMGRSzW9hCRWH1zIon6H9ePPy0kMfQBRQcC2hLBME6NPxsh3
+mfalAw+gjme54R31TIvt4x5y1gwtf//TW/+WxgIKWHaCtXZ8ADGrYraYmyYBcMLd
+9bRVdLq+weJWS97RoDB3OA0DEXdWIZFfS56umGnjgNnnl6YRvnaW7pCeMX+NcMv+
+v4vqA+AeqizM2VUUbzUUPwF8NVIYX0w98kReWp08tIEDssZyOBAkE+pHkrEFx0Vz
+Pp+Qq2BPw6MFsheLuq4bhBwoisVmuPNJpccG7D8lJGH5/PHyT3kR3QMHPoNtOWDV
+ZtyyIolMu8VTBkbJJAr1
+=p48C
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index ea042422e8ce68407f1d34464a22c56288e65511..6b20a173941fa27a7acc98267beb5f3101f25a0a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0b945101aa4e70f2f6dd389db57bd2e503bdbb41
\ No newline at end of file
+bd03d3331dc7cb122175370d9e27dca57f42c561
\ No newline at end of file

diff --git a/tool/lemon.c b/tool/lemon.c
index 25192fb151c79515a65901182408bd89b9c8b95a..1bff5270bc9ec8a83c476547853eaa72629e5f41 100644 (file)
--- a/tool/lemon.c
+++ b/tool/lemon.c
@@ -20,7 +20,13 @@
 #endif
 
 #ifdef __WIN32__
+#ifdef __cplusplus
+extern "C" {
+#endif
 extern int access(const char *path, int mode);
+#ifdef __cplusplus
+}
+#endif
 #else
 #include <unistd.h>
 #endif