[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/krfb/libvncserver
From:       George Kiagiadakis <kiagiadakis.george () gmail ! com>
Date:       2010-11-10 18:57:14
Message-ID: 20101110185714.35602AC8A5 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1195284 by gkiagia:

Fix compilation in c89 mode.

 M  +1 -1      auth.c  
 M  +2 -2      rfb/rfb.h  
 M  +3 -3      rfbserver.c  
 M  +1 -1      scale.c  
 M  +1 -1      scale.h  
 M  +4 -0      zywrletemplate.c  


--- trunk/KDE/kdenetwork/krfb/libvncserver/auth.c #1195283:1195284
@@ -30,7 +30,7 @@
 #include <rfb/rfb.h>
 
 /* RFB 3.8 clients are well informed */
-void rfbClientSendString(rfbClientPtr cl, char *reason);
+void rfbClientSendString(rfbClientPtr cl, const char *reason);
 
 
 /*
--- trunk/KDE/kdenetwork/krfb/libvncserver/rfb/rfb.h #1195283:1195284
@@ -668,7 +668,7 @@
 extern rfbClientPtr rfbReverseConnection(rfbScreenInfoPtr rfbScreen,char *host, int \
port);  extern void rfbClientConnectionGone(rfbClientPtr cl);
 extern void rfbProcessClientMessage(rfbClientPtr cl);
-extern void rfbClientConnFailed(rfbClientPtr cl, char *reason);
+extern void rfbClientConnFailed(rfbClientPtr cl, const char *reason);
 extern void rfbNewUDPConnection(rfbScreenInfoPtr rfbScreen,int sock);
 extern void rfbProcessUDPInput(rfbScreenInfoPtr rfbScreen);
 extern rfbBool rfbSendFramebufferUpdate(rfbClientPtr cl, sraRegionPtr updateRegion);
@@ -684,7 +684,7 @@
 extern char *rfbProcessFileTransferReadBuffer(rfbClientPtr cl, uint32_t length);
 extern rfbBool rfbSendFileTransferChunk(rfbClientPtr cl);
 extern rfbBool rfbSendDirContent(rfbClientPtr cl, int length, char *buffer);
-extern rfbBool rfbSendFileTransferMessage(rfbClientPtr cl, uint8_t contentType, \
uint8_t contentParam, uint32_t size, uint32_t length, char *buffer); +extern rfbBool \
rfbSendFileTransferMessage(rfbClientPtr cl, uint8_t contentType, uint8_t \
contentParam, uint32_t size, uint32_t length, const char *buffer);  extern char \
*rfbProcessFileTransferReadBuffer(rfbClientPtr cl, uint32_t length);  extern rfbBool \
rfbProcessFileTransfer(rfbClientPtr cl, uint8_t contentType, uint8_t contentParam, \
uint32_t size, uint32_t length);  
--- trunk/KDE/kdenetwork/krfb/libvncserver/rfbserver.c #1195283:1195284
@@ -647,7 +647,7 @@
 
 
 void
-rfbClientSendString(rfbClientPtr cl, char *reason)
+rfbClientSendString(rfbClientPtr cl, const char *reason)
 {
     char *buf;
     int len = strlen(reason);
@@ -672,7 +672,7 @@
 
 void
 rfbClientConnFailed(rfbClientPtr cl,
-                    char *reason)
+                    const char *reason)
 {
     char *buf;
     int len = strlen(reason);
@@ -1088,7 +1088,7 @@
 
 int DB = 1;
 
-rfbBool rfbSendFileTransferMessage(rfbClientPtr cl, uint8_t contentType, uint8_t \
contentParam, uint32_t size, uint32_t length, char *buffer) +rfbBool \
rfbSendFileTransferMessage(rfbClientPtr cl, uint8_t contentType, uint8_t \
contentParam, uint32_t size, uint32_t length, const char *buffer)  {
     rfbFileTransferMsg ft;
     ft.type = rfbFileTransfer;
--- trunk/KDE/kdenetwork/krfb/libvncserver/scale.c #1195283:1195284
@@ -86,7 +86,7 @@
 /* So, all of the encodings point to the ->screen->frameBuffer,
  * We need to change this!
  */
-void rfbScaledCorrection(rfbScreenInfoPtr from, rfbScreenInfoPtr to, int *x, int *y, \
int *w, int *h, char *function) +void rfbScaledCorrection(rfbScreenInfoPtr from, \
rfbScreenInfoPtr to, int *x, int *y, int *w, int *h, const char *function)  {
     double x1,y1,w1,h1, x2, y2, w2, h2;
     double scaleW = ((double) to->width) / ((double) from->width);
--- trunk/KDE/kdenetwork/krfb/libvncserver/scale.h #1195283:1195284
@@ -1,7 +1,7 @@
 
 int ScaleX(rfbScreenInfoPtr from, rfbScreenInfoPtr to, int x);
 int ScaleY(rfbScreenInfoPtr from, rfbScreenInfoPtr to, int y);
-void rfbScaledCorrection(rfbScreenInfoPtr from, rfbScreenInfoPtr to, int *x, int *y, \
int *w, int *h, char *function); +void rfbScaledCorrection(rfbScreenInfoPtr from, \
rfbScreenInfoPtr to, int *x, int *y, int *w, int *h, const char *function);  void \
rfbScaledScreenUpdateRect(rfbScreenInfoPtr screen, rfbScreenInfoPtr ptr, int x0, int \
y0, int w0, int h0);  void rfbScaledScreenUpdate(rfbScreenInfoPtr screen, int x1, int \
y1, int x2, int y2);  rfbScreenInfoPtr rfbScaledScreenAllocate(rfbClientPtr cl, int \
                width, int height);
--- trunk/KDE/kdenetwork/krfb/libvncserver/zywrletemplate.c #1195283:1195284
@@ -143,8 +143,12 @@
 #ifdef WIN32
 #define InlineX __inline
 #else
+# ifndef __STRICT_ANSI__
 #define InlineX inline
+# else
+#  define InlineX
 #endif
+#endif
 
 #ifdef ZYWRLE_ENCODE
 /* Tables for Coefficients filtering. */


[prev in list] [next in list] [prev in thread] [next in thread]