[patch] nx-x11-1.4.0-gcc4.patch

nx-x11-1.4.0-gcc4.patch (text/plain), 5.77 KB, created by Rafael on 2005-11-20 10:33:20 UTC

diff -pruN work.orig/nxcomp/RenderExtension.h work/nxcomp/RenderExtension.h
--- work.orig/nxcomp/RenderExtension.h	2004-08-23 09:35:23.000000000 +0200
+++ work/nxcomp/RenderExtension.h	2005-11-20 12:28:48.240951721 +0100
@@ -142,97 +142,6 @@ class RenderExtensionMessage : public Me
   } raw_data;
 };
 
-class RenderExtensionStore : public MessageStore
-{
-  public:
-
-  RenderExtensionStore(Compressor *compressor, Decompressor *decompressor);
-
-  virtual ~RenderExtensionStore();
-
-  virtual const char *name() const
-  {
-    return "RenderExtension";
-  }
-
-  virtual unsigned char opcode() const
-  {
-    return opcode_;
-  }
-
-  virtual unsigned int storage() const
-  {
-    return sizeof(RenderExtensionMessage);
-  }
-
-  //
-  // Message handling methods.
-  //
-
-  public:
-
-  virtual Message *create() const
-  {
-    return new RenderExtensionMessage();
-  }
-
-  virtual Message *create(const Message &message) const
-  {
-    return new RenderExtensionMessage((const RenderExtensionMessage &) message);
-  }
-
-  virtual void destroy(Message *message) const
-  {
-    delete (RenderExtensionMessage *) message;
-  }
-
-  //
-  // In protocol step 5 these methods must be
-  // specialized for each of the RENDER opcodes
-  // in their minor stores.
-  //
-
-  virtual int identitySize(const unsigned char *buffer, unsigned int size);
-
-  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
-                                 const unsigned int size, int bigEndian,
-                                     ChannelCache *channelCache) const;
-
-  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
-                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
-                                     ChannelCache *channelCache) const;
-
-  virtual int parseIdentity(Message *message, const unsigned char *buffer,
-                                unsigned int size, int bigEndian) const;
-
-  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
-                                  unsigned int size, int bigEndian) const;
-
-  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
-                                  const Message *cachedMessage,
-                                      ChannelCache *channelCache) const;
-
-  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
-                                  ChannelCache *channelCache) const;
-
-  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
-                                    unsigned int size, int bigEndian) const;
-
-  virtual void dumpIdentity(const Message *message) const;
-
-  private:
-
-  unsigned char opcode_;
-
-  //
-  // Keep pointers to specialized classes.
-  //
-
-  RenderMinorExtensionStore *minors_[RENDEREXTENSION_MINOR_OPCODE_LIMIT];
-
-  RenderMinorExtensionStore *generic_;
-};
-
 class RenderMinorExtensionStore : public MinorMessageStore
 {
   public:
@@ -329,4 +238,97 @@ class RenderMinorExtensionStore : public
                               ChannelCache *channelCache) const;
 };
 
+class RenderExtensionStore : public MessageStore
+{
+  public:
+
+  RenderExtensionStore(Compressor *compressor, Decompressor *decompressor);
+
+  virtual ~RenderExtensionStore();
+
+  virtual const char *name() const
+  {
+    return "RenderExtension";
+  }
+
+  virtual unsigned char opcode() const
+  {
+    return opcode_;
+  }
+
+  virtual unsigned int storage() const
+  {
+    return sizeof(RenderExtensionMessage);
+  }
+
+  //
+  // Message handling methods.
+  //
+
+  public:
+
+  virtual Message *create() const
+  {
+    return new RenderExtensionMessage();
+  }
+
+  virtual Message *create(const Message &message) const
+  {
+    return new RenderExtensionMessage((const RenderExtensionMessage &) message);
+  }
+
+  virtual void destroy(Message *message) const
+  {
+    delete (RenderExtensionMessage *) message;
+  }
+
+  //
+  // In protocol step 5 these methods must be
+  // specialized for each of the RENDER opcodes
+  // in their minor stores.
+  //
+
+  virtual int identitySize(const unsigned char *buffer, unsigned int size);
+
+  virtual int encodeIdentity(EncodeBuffer &encodeBuffer, const unsigned char *buffer,
+                                 const unsigned int size, int bigEndian,
+                                     ChannelCache *channelCache) const;
+
+  virtual int decodeIdentity(DecodeBuffer &decodeBuffer, unsigned char *&buffer,
+                                 unsigned int &size, int bigEndian, WriteBuffer *writeBuffer,
+                                     ChannelCache *channelCache) const;
+
+  virtual int parseIdentity(Message *message, const unsigned char *buffer,
+                                unsigned int size, int bigEndian) const;
+
+  virtual int unparseIdentity(const Message *message, unsigned char *buffer,
+                                  unsigned int size, int bigEndian) const;
+
+  virtual void updateIdentity(EncodeBuffer &encodeBuffer, const Message *message,
+                                  const Message *cachedMessage,
+                                      ChannelCache *channelCache) const;
+
+  virtual void updateIdentity(DecodeBuffer &decodeBuffer, const Message *message,
+                                  ChannelCache *channelCache) const;
+
+  virtual void identityChecksum(const Message *message, const unsigned char *buffer,
+                                    unsigned int size, int bigEndian) const;
+
+  virtual void dumpIdentity(const Message *message) const;
+
+  private:
+
+  unsigned char opcode_;
+
+  //
+  // Keep pointers to specialized classes.
+  //
+
+  RenderMinorExtensionStore *minors_[RENDEREXTENSION_MINOR_OPCODE_LIMIT];
+
+  RenderMinorExtensionStore *generic_;
+};
+
+
+
 #endif /* RenderExtension_H */