2018-01-05 Fred Gleason <fredg@paravelsystems.com>

* Fixed bugs that broke the build under Windows.

ChangeLog

@@ -16557,3 +16557,5 @@
 	a new clock in rdlogmanager(1).
 2018-01-03 Fred Gleason <fredg@paravelsystems.com>
 	* Fixed races in creation of new carts.
+2018-01-05 Fred Gleason <fredg@paravelsystems.com>
+	* Fixed bugs that broke the build under Windows.

lib/lib.pro

@@ -72,6 +72,7 @@ SOURCES += rdevent_line.cpp
 SOURCES += rdexception_dialog.cpp
 SOURCES += rdget_ath.cpp
 SOURCES += rdgetpasswd.cpp
+SOURCES += rdgroup.cpp
 SOURCES += rdgroup_list.cpp
 SOURCES += rdidvalidator.cpp
 SOURCES += rdintegeredit.cpp
@@ -152,7 +153,6 @@ x11 {
   SOURCES += rdexport_settings_dialog.cpp
   SOURCES += rdgpioselector.cpp
   SOURCES += rdgrid.cpp
-  SOURCES += rdgroup.cpp
   SOURCES += rdhash.cpp
   SOURCES += rdimport_audio.cpp
   SOURCES += rdkernelgpio.cpp
@@ -214,6 +214,7 @@ HEADERS += rdexception_dialog.h
 HEADERS += rdget_ath.h
 HEADERS += rdgetpasswd.h
 HEADERS += rdgroup_list.h
+HEADERS += rdgroup.h
 HEADERS += rd.h
 HEADERS += rdidvalidator.h
 HEADERS += rdintegeredit.h
@@ -292,7 +293,6 @@ x11 {
   HEADERS += rdgpioselector.h
   HEADERS += rdgrid.h
   HEADERS += rdgpio.h
-  HEADERS += rdgroup.h
   HEADERS += rdhash.h
   HEADERS += rdimport_audio.h
   HEADERS += rdkernelgpio.h

lib/rdgroup.cpp

@@ -19,7 +19,9 @@
 //
 
 #include <sys/types.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif  // WIN32
 
 #include <qobject.h>
 
@@ -230,7 +232,7 @@ void RDGroup::setColor(const QColor &color)
 }
 
 
-unsigned RDGroup::RDGroup::nextFreeCart(unsigned startcart) const
+unsigned RDGroup::nextFreeCart(unsigned startcart) const
 {
   return GetNextFreeCart(startcart);
 }
@@ -266,7 +268,7 @@ int RDGroup::freeCartQuantity() const
   return free;
 }
 
-
+#ifndef WIN32
 bool RDGroup::reserveCarts(std::vector<unsigned> *cart_nums,
 			   const QString &station_name,RDCart::Type type,
 			   unsigned quan) const
@@ -301,7 +303,7 @@ bool RDGroup::reserveCarts(std::vector<unsigned> *cart_nums,
 
   return false;
 }
-
+#endif  // WIN32
 
 bool RDGroup::cartNumberValid(unsigned cartnum) const
 {
@@ -423,6 +425,7 @@ unsigned RDGroup::GetNextFreeCart(unsigned startcart) const
 }
 
 
+#ifndef WIN32
 bool RDGroup::ReserveCart(const QString &station_name,RDCart::Type type,
 			  unsigned cart_num) const
 {
@@ -448,6 +451,7 @@ bool RDGroup::ReserveCart(const QString &station_name,RDCart::Type type,
   }
   return ret;
 }
+#endif  // WIN32
 
 
 void RDGroup::SetRow(const QString &param,int value) const

lib/rdgroup.h

@@ -60,16 +60,20 @@ class RDGroup
   void setColor(const QColor &color);
   unsigned nextFreeCart(unsigned startcart=0) const;
   int freeCartQuantity() const;
+#ifndef WIN32
   bool reserveCarts(std::vector<unsigned> *cart_nums,
 		    const QString &station_name,RDCart::Type type,
 		    unsigned quan) const;
+#endif  // WIN32
   bool cartNumberValid(unsigned cartnum) const;
   QString xml() const;
   
  private:
   unsigned GetNextFreeCart(unsigned startcart) const;
+#ifndef WIN32
   bool ReserveCart(const QString &station_name,RDCart::Type type,
 		   unsigned cart_num) const;
+#endif  // WIN32
   void SetRow(const QString &param,int value) const;
   void SetRow(const QString &param,unsigned value) const;
   void SetRow(const QString &param,const QString &value) const;