From a6248dfc982e77e5fb7f132b1807a61682b6cbb1 Mon Sep 17 00:00:00 2001
From: Ron Pedde <ron@pedde.com>
Date: Mon, 6 Mar 2006 06:29:03 +0000
Subject: [PATCH] Add sqlite3, fix minor compilation problems

---
 src/conf.c            | 4 +++-
 src/mp3-scanner.c     | 2 +-
 src/rend-win32.c      | 2 +-
 win32/config.h        | 2 +-
 win32/mt-daapd.vcproj | 3 +++
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/conf.c b/src/conf.c
index 86a89fe1..4ba9a1b5 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -35,7 +35,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/param.h>
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
 
 #include "conf.h"
 #include "err.h"
diff --git a/src/mp3-scanner.c b/src/mp3-scanner.c
index 5cf48051..84525ee7 100644
--- a/src/mp3-scanner.c
+++ b/src/mp3-scanner.c
@@ -682,7 +682,7 @@ void make_composite_tags(MP3FILE *song) {
     if((conf_get_int("scanning","concat compilations",0)) && 
        song->artist &&
        song->title) {
-        len = strlen(song->artist) + strlen(song->title);
+        len = (int)strlen(song->artist) + (int)strlen(song->title);
         ptmp = (char*)malloc(len + 4);
         if(ptmp) {
             sprintf(ptmp,"%s - %s",song->artist, song->title);
diff --git a/src/rend-win32.c b/src/rend-win32.c
index e6b1dde7..0b38334e 100644
--- a/src/rend-win32.c
+++ b/src/rend-win32.c
@@ -144,7 +144,7 @@ int rend_register(char *name, char *type, int port, char *iface, char *txt) {
             name, type, port);
 
     DNSServiceRegister(&rend_client,0,kDNSServiceInterfaceIndexAny,name,type,"local",NULL,
-        htons((unsigned short)port),strlen(txt),txt,rend_reg_reply, NULL);
+        port_netorder,(uint16_t)strlen(txt),txt,rend_reg_reply, NULL);
     
     /* throw off a new thread work this */
     if(!rend_count) {
diff --git a/win32/config.h b/win32/config.h
index 4d227660..0edb8c6a 100644
--- a/win32/config.h
+++ b/win32/config.h
@@ -32,7 +32,7 @@
 #define HAVE_LIBSQLITE 1
 
 /* Define to 1 if you have the `sqlite3' library (-lsqlite3). */
-/* #define HAVE_LIBSQLITE3 1 */
+#define HAVE_LIBSQLITE3 1
 
 /* Define to 1 if you have the `vorbis' library (-lvorbis). */
 /* #undef HAVE_LIBVORBIS */
diff --git a/win32/mt-daapd.vcproj b/win32/mt-daapd.vcproj
index 7311376c..00e0487a 100644
--- a/win32/mt-daapd.vcproj
+++ b/win32/mt-daapd.vcproj
@@ -135,6 +135,9 @@
 			<File
 				RelativePath="..\src\db-sql-sqlite2.c">
 			</File>
+			<File
+				RelativePath="..\src\db-sql-sqlite3.c">
+			</File>
 			<File
 				RelativePath="..\src\db-sql.c">
 			</File>