2016-07-15 Fred Gleason <fredg@paravelsystems.com>

* Fixed bugs in 'lib/lib.pro', 'lib/rdweb.cpp, 'lib/rdweb.h' and
	'rdlogedit/edit_logline.cpp' that broke the build under Windows.

ChangeLog

@@ -15297,3 +15297,6 @@
 2016-07-13 Fred Gleason <fredg@paravelsystems.com>
 	* Made the 'Allow Cart Dragging' checkbox setting persistent across
 	RDLibrary sessions in 'rdlibrary/rdlibrary.cpp'.
+2016-07-15 Fred Gleason <fredg@paravelsystems.com>
+	* Fixed bugs in 'lib/lib.pro', 'lib/rdweb.cpp, 'lib/rdweb.h' and
+	'rdlogedit/edit_logline.cpp' that broke the build under Windows.

lib/lib.pro

@@ -99,6 +99,7 @@ SOURCES += rdreport.cpp
 SOURCES += rdripc.cpp
 SOURCES += rdschedcode.cpp
 SOURCES += rdsegmeter.cpp
+SOURCES += rdsettings.cpp
 SOURCES += rdslider.cpp
 SOURCES += rdsocket.cpp
 SOURCES += rdstation.cpp
@@ -112,6 +113,7 @@ SOURCES += rdtimeengine.cpp
 SOURCES += rdtransportbutton.cpp
 SOURCES += rduser.cpp
 SOURCES += rdwavedata.cpp
+SOURCES += rdweb.cpp
 SOURCES += schedcartlist.cpp
 SOURCES += schedruleslist.cpp
 win32 {
@@ -158,7 +160,6 @@ x11 {
   SOURCES += rdpasswd.cpp
   SOURCES += rdplay_deck.cpp
   SOURCES += rdrecording.cpp
-  SOURCES += rdsettings.cpp
   SOURCES += rdsimpleplayer.cpp
   SOURCES += rdsound_panel.cpp
   SOURCES += rdstatus.cpp
@@ -233,6 +234,7 @@ HEADERS += rdreport.h
 HEADERS += rdripc.h
 HEADERS += rdschedcode.h
 HEADERS += rdsegmeter.h
+HEADERS += rdsettings.h
 HEADERS += rdslider.h
 HEADERS += rdsocket.h
 HEADERS += rdstation.h
@@ -247,6 +249,7 @@ HEADERS += rdtransportbutton.h
 HEADERS += rdttydevice.h
 HEADERS += rduser.h
 HEADERS += rdwavedata.h
+HEADERS += rdweb.h
 
 win32 {
   HEADERS += rdwin32.h
@@ -291,7 +294,6 @@ x11 {
   HEADERS += rdpasswd.h
   HEADERS += rdplay_deck.h
   HEADERS += rdrecording.h
-  HEADERS += rdsettings.h
   HEADERS += rdsimpleplayer.h
   HEADERS += rdsound_panel.h
   HEADERS += rdstatus.h

lib/rdweb.cpp

@@ -22,7 +22,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#ifndef WIN32
 #include <sys/time.h>
+#endif  //WIN32
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -34,11 +36,13 @@
 #include <rduser.h>
 #include <rddb.h>
 #include <rdconf.h>
+#ifndef WIN32
 #include <rdwebresult.h>
+#endif  // WIN32
 
 #include <rdweb.h>
 
-
+#ifndef WIN32
 /* RDReadPost(char *cBuffer,int dSize) */
 
 /* This function reads POST data (such as that submitted by an HTML form) into
@@ -871,6 +875,8 @@ bool RDParsePost(std::map<QString,QString> *vars)
   return true;
 }
 
+#endif  // WIN32
+
 
 QString RDXmlField(const QString &tag,const QString &value,const QString &attrs)
 {

lib/rdweb.h

@@ -42,6 +42,7 @@
 //
 // Function Prototypes
 //
+#ifndef WIN32
 extern int RDReadPost(char *,int);
 extern int RDPutPostString(char *,char *,char *,int);
 extern int RDFindPostString(const char *,const char *,char *,int);
@@ -69,6 +70,7 @@ extern QString RDAuthenticateSession(long int session_id,
 				     const QHostAddress &addr);
 extern void RDLogoutSession(long int session_id,const QHostAddress &addr);
 extern bool RDParsePost(std::map<QString,QString> *vars);
+#endif  // WIN32
 extern QString RDXmlField(const QString &tag,const QString &value,
 			  const QString &attrs="");
 extern QString RDXmlField(const QString &tag,const char *value,

rdlogedit/edit_logline.cpp

@@ -70,9 +70,14 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group,
   // Cart Picker
   //
 #ifdef WIN32
+  /*
   edit_cart_dialog=new RDCartDialog(&edit_filter,&edit_group,&edit_schedcode,
 				    NULL,NULL,rdstation_conf,rdsystem,
 				    log_config,this);
+  */
+  edit_cart_dialog=new RDCartDialog(edit_filter,edit_group,edit_schedcode,
+				    NULL,NULL,rdstation_conf,rdsystem,
+				    log_config,this);
 #else
   edit_cart_dialog=new RDCartDialog(edit_filter,edit_group,edit_schedcode,
 				    rdcae,rdripc,rdstation_conf,rdsystem,