kdenetwork/krdc don't build ;(

[fenix]

Hi,

  another build error ;(
  with recent CVS HEAD krdc don't build:

++ -DHAVE_CONFIG_H -I. -I. -I.. -I/home/kde3/kde3/include
-I/home/kde3/CVS/qt-copy/include -I/usr/X11R6/include  
-DQT_THREAD_SUPPORT  -D_REENTRANT -D_FILE_OFFSET_BITS=64 
-Wnon-virtual-dtor -Wno-long-long -Wbad-function-cast -Wundef -Wall
-pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi
-D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -DNDEBUG
-DNO_DEBUG -O2 -fno-exceptions -fno-check-new -DQT_NO_COMPAT
-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DKDE_NO_COMPAT
-DKDE_NO_COMPAT_H  -c -o krdc.all_cpp.o `test -f krdc.all_cpp.cpp ||
echo './'`krdc.all_cpp.cpp
In file included from vncviewer.h:44,
                 from threads.cpp:21,
                 from krdc.all_cpp.cpp:5:
rfbproto.h:65: conflicting types for `typedef struct rfbRectangle
rfbRectangle'
rfbproto.h:65: previous declaration as `typedef struct rfbRectangle
rfbRectangle'
rfbproto.h:120: conflicting types for `typedef struct rfbPixelFormat
rfbPixelFormat'
rfbproto.h:120: previous declaration as `typedef struct rfbPixelFormat
rfbPixelFormat'
rfbproto.h:218: conflicting types for `typedef struct rfbClientInitMsg
rfbClientInitMsg'
rfbproto.h:218: previous declaration as `typedef struct rfbClientInitMsg
rfbClientInitMsg'
rfbproto.h:237: conflicting types for `typedef struct rfbServerInitMsg
rfbServerInitMsg'
rfbproto.h:237: previous declaration as `typedef struct rfbServerInitMsg
rfbServerInitMsg'
rfbproto.h:359: conflicting types for `typedef struct
rfbFramebufferUpdateMsg rfbFramebufferUpdateMsg'
rfbproto.h:359: previous declaration as `typedef struct
rfbFramebufferUpdateMsg rfbFramebufferUpdateMsg'
rfbproto.h:374: conflicting types for `typedef struct
rfbFramebufferUpdateRectHeader rfbFramebufferUpdateRectHeader'
rfbproto.h:374: previous declaration as `typedef struct
rfbFramebufferUpdateRectHeader rfbFramebufferUpdateRectHeader'
rfbproto.h:393: conflicting types for `typedef struct rfbCopyRect
rfbCopyRect'
rfbproto.h:393: previous declaration as `typedef struct rfbCopyRect
rfbCopyRect'
rfbproto.h:407: conflicting types for `typedef struct rfbRREHeader
rfbRREHeader'
rfbproto.h:407: previous declaration as `typedef struct rfbRREHeader
rfbRREHeader'
rfbproto.h:425: conflicting types for `typedef struct rfbCoRRERectangle
rfbCoRRERectangle'
rfbproto.h:425: previous declaration as `typedef struct
rfbCoRRERectangle rfbCoRRERectangle'
<snip>


 rfbproto.h and vncviewer.h (who include rfbproto.h) don't have
#ifdef/#define/#endif statements for multiple inclusions (i think
because they are imported from vnc code base) 
 
 But vncviewer.h is included in:
 
[kde3 at DarKBlue krdc]$ grep \"vncviewer.h\" *.*
colour.c:#include "vncviewer.h"
desktop.c:#include "vncviewer.h"
kvncview.cpp:#include "vncviewer.h"
rfbproto.c:#include "vncviewer.h"
sockets.c:#include "vncviewer.h"
threads.cpp:#include "vncviewer.h

maybe an inlude wrapper as:

#ifndef VNCVIEW_WRAPPER_H
#define VNCVIEW_WRAPPER_H
#include "vncviewer.h"
#endif

correct this 

 FeniX