[Kstars-devel] kdeedu/kstars/kstars

[Jason Harris]

CVS commit by harris: 

Applied reporter-supplied patches for each of three bug reports related to Solaris compat issues 
in our INDI telescope control code.  Please test.

CCMAIL: 70973-done at bugs.kde.org
CCMAIL: 70974-done at bugs.kde.org
CCMAIL: 70976-done at bugs.kde.org
CCMAIL: kstars-devel at kde.org


  M +1 -1      indidevice.cpp   1.19
  M +1 -1      indi/Makefile.am   1.14
  M +2 -2      indi/lx200driver.c   1.12


--- kdeedu/kstars/kstars/indidevice.cpp  #1.18:1.19
@@ -2332,5 +2332,5 @@ bool DeviceManager::indiConnect(QString 
 
 
-        bzero(&pin, sizeof(pin));
+        memset(&pin, 0, sizeof(pin));
         pin.sin_family          = AF_INET;
         pin.sin_addr.s_addr     = ((struct in_addr *) (serverHostName->h_addr))->s_addr;

--- kdeedu/kstars/kstars/indi/Makefile.am  #1.13:1.14
@@ -7,5 +7,5 @@
 
 indiserver_SOURCES = indiserver.c
-indiserver_LDADD = liblilxml.a
+indiserver_LDADD = liblilxml.a $(LIBSOCKET)
 
 lx200generic_SOURCES = indidrivermain.c eventloop.c lx200driver.c lx200autostar.cpp lx200_16.cpp lx200gps.cpp lx200generic.cpp lx200classic.cpp

--- kdeedu/kstars/kstars/indi/lx200driver.c  #1.11:1.12
@@ -956,6 +956,6 @@ int openPort(const char *portID)
 
    /* set baud rate */
-   ttyOptions.c_ispeed = B9600;
-   ttyOptions.c_ospeed = B9600;
+   cfsetispeed(&ttyOptions, B9600);
+   cfsetospeed(&ttyOptions, B9600);
 
   /* set input/output flags */