Hi,

building SVN 1.8 using sqlite >= SQLite 3.12.0 (amalgamation) and VS
2005+ raises the following error:

[...]\sqlite\sqlite3.c(42437): error C4013: 'rand_s' undefined; assuming
extern returning int
[[...]\1.8.16\build\win32\vcnet-vcproj\test_wc_queries.vcxproj]

The issue does not exist in SVN != 1.8 as far as I see. Full details
available here: http://www.luke1410.de:8090/browse/MAXSVN-58

The attached patch (based on the patch fixing the related issue in 1.7)
resolves that by moving the sqlite3.c-include section to be first
include statement in the file.

If it's ok, I'll just add a 1.8 backport branch and nominate it for
backporting to the 1.8-branch.

Regards,
Stefan

Index: subversion/tests/libsvn_wc/wc-queries-test.c
===================================================================
--- subversion/tests/libsvn_wc/wc-queries-test.c	(revision 1746366)
+++ subversion/tests/libsvn_wc/wc-queries-test.c	(working copy)
@@ -21,14 +21,6 @@
  * ====================================================================
  */
 
-#include "svn_pools.h"
-#include "svn_ctype.h"
-#include "private/svn_dep_compat.h"
-
-#include "svn_private_config.h"
-
-#include "../svn_test.h"
-
 #ifdef SVN_SQLITE_INLINE
 /* Include sqlite3 inline, making all symbols private. */
   #define SQLITE_API static
@@ -48,6 +40,14 @@
   #include <sqlite3.h>
 #endif
 
+#include "svn_pools.h"
+#include "svn_ctype.h"
+#include "private/svn_dep_compat.h"
+
+#include "svn_private_config.h"
+
+#include "../svn_test.h"
+
 #include "../../libsvn_wc/wc-queries.h"
 
 WC_QUERIES_SQL_DECLARE_STATEMENTS(wc_queries);

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature

Reply via email to