Attachment 598 Details for Bug 5430 – CTC patch to fix (some) GCC 4.9 problems

[patch] CTC patch to fix (some) GCC 4.9 problems

ctc-gcc-4.9.patch (text/plain), 2.44 KB, created by Peter Åstrand on 2015-02-11 09:57:59 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Åstrand

Created: 2015-02-11 09:57:59 CET

Size: 2.44 KB

patch

obsolete

>Index: client/tlclient/tlclient_config_base.cc
>===================================================================
>--- client/tlclient/tlclient_config_base.cc	(revision 29964)
>+++ client/tlclient/tlclient_config_base.cc	(arbetskopia)
>@@ -6,6 +6,7 @@
> 
> #include <string.h>
> #include <stdlib.h>
>+#include <unistd.h> 
> 
> #include "tlclient_config_base.h"
> #include "tlclient_util.h"
>Index: client/tlclient/services/service_process.cc
>===================================================================
>--- client/tlclient/services/service_process.cc	(revision 29964)
>+++ client/tlclient/services/service_process.cc	(arbetskopia)
>@@ -4,6 +4,7 @@
> // For more information, see http://www.cendio.com
> 
> #include <string.h>
>+#include <unistd.h>
> 
> #include "service_process.h"
> #include "../tlclient_util.h"
>Index: client/tlclient/services/connection_socket.cc
>===================================================================
>--- client/tlclient/services/connection_socket.cc	(revision 29964)
>+++ client/tlclient/services/connection_socket.cc	(arbetskopia)
>@@ -48,7 +48,7 @@
> }
> 
> 
>-int ConnectionSocket::sendData(char *data, size_t size)
>+int ConnectionSocket::sendData(const char *data, size_t size)
> {
>     return send(fd, data, size, 0);
> }
>Index: client/tlclient/services/connection_socket.h
>===================================================================
>--- client/tlclient/services/connection_socket.h	(revision 29964)
>+++ client/tlclient/services/connection_socket.h	(arbetskopia)
>@@ -20,7 +20,7 @@
>         ConnectionSocket(Service * parent, int fd );
>         virtual ~ConnectionSocket() = 0;
>         int readData();
>-        int sendData(char *data, size_t size);
>+        int sendData(const char *data, size_t size);
> 
>     protected:
>         int descriptor() {
>Index: client/tlclient/tlclient_tlcontrol.cc
>===================================================================
>--- client/tlclient/tlclient_tlcontrol.cc	(revision 29964)
>+++ client/tlclient/tlclient_tlcontrol.cc	(arbetskopia)
>@@ -13,7 +13,6 @@
> #include "tlclient_util.h"
> #include "tlclient_fltk.h"
> #include <stdio.h>
>-#include <math.h>
> #include <string.h>
> 
> #include <FL/x.H>
>@@ -860,7 +859,7 @@
> 
>     /* Create radio buttons */
>     for (modenum = 0; modenum < modes.size(); modenum++) {
>-        row = (unsigned int) floor(modenum / 3);
>+	row = modenum / 3;
>         column = modenum % 3;
> 
>         screen_size_button[modenum] = new Fl_Round_Button(resolution_group->x() + X_MARGIN + MODEBUTTON_WIDTH*column,

Actions: View

Attachments on bug 5430: 598