diff --git a/manifest b/manifest
index e50a8fe385..7ac281b20c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\sshowdb.c\sutility\sso\sthat\sit\sworks\swith\sdatabases\slarger\sthan\s4GiB.\s(CVS\s6656)
-D 2009-05-19T03:21:53
+C Improvements\sto\sthe\sSQLITE_INT_TO_PTR\smacro\sto\sreduce\sthe\snumber\sof\nwarnings.\s\sFor\ssome\splatforms\sit\smight\sbe\snecessary\sto\scompile\swith\nthe\s-DHAVE_STDINT_H\sflag.\s\sTicket\s#3860.\s(CVS\s6657)
+D 2009-05-19T14:21:29
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -162,7 +162,7 @@ F src/select.c e5813bd0a75f8d303a56667fa669c8cb9d47c375
 F src/shell.c 0a11f831603f17fea20ca97133c0f64e716af4a7
 F src/sqlite.h.in 0c459a45c1047be24c6a58646e8be4d001a3a28a
 F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
-F src/sqliteInt.h 3de645e5f55fd460d470971b05cdc0aa79398f60
+F src/sqliteInt.h 68b1b7aebcbed22d302251a56e85fa1339407db3
 F src/sqliteLimit.h ffe93f5a0c4e7bd13e70cd7bf84cfb5c3465f45d
 F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76
 F src/table.c cc86ad3d6ad54df7c63a3e807b5783c90411a08d
@@ -729,7 +729,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 8c3c0c24c82606df41653dbf7324bf9f166c933a
-R 8159ad1a37cd6a189fa091b0bc1b72f2
+P 9675b6223645fe01b202cbefae63f3209a50efcc
+R eb53957791a887f64e4f685f972f02b8
 U drh
-Z 03796d8e260a6be756464208bda70f77
+Z c7784eccbedf809f068273bf3d8d4078
diff --git a/manifest.uuid b/manifest.uuid
index f4f2f406ed..36f393267a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9675b6223645fe01b202cbefae63f3209a50efcc
\ No newline at end of file
+1b0ee9d188c000a2331caae2e9c8b89b0bcbc0b0
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index e943412b39..e141c928c3 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.873 2009/05/18 13:34:38 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.874 2009/05/19 14:21:29 drh Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -70,8 +70,13 @@
 ** compiler.
 */
 #if defined(__GNUC__)
-# define SQLITE_INT_TO_PTR(X)  ((void*)(X))
-# define SQLITE_PTR_TO_INT(X)  ((int)(X))
+# if defined(HAVE_STDINT_H)
+#   define SQLITE_INT_TO_PTR(X)  ((void*)(intptr_t)(X))
+#   define SQLITE_PTR_TO_INT(X)  ((int)(intptr_t)(X))
+# else
+#   define SQLITE_INT_TO_PTR(X)  ((void*)(X))
+#   define SQLITE_PTR_TO_INT(X)  ((int)(X))
+# endif
 #else
 # define SQLITE_INT_TO_PTR(X)   ((void*)&((char*)0)[X])
 # define SQLITE_PTR_TO_INT(X)   ((int)(((char*)X)-(char*)0))