From 82d1ecf8d7a6ab795814d24dbd31f5409eea9118 Mon Sep 17 00:00:00 2001
From: Zachary Pavlov <zachary.pavlov@gmail.com>
Date: Wed, 8 Nov 2006 03:03:00 +0000
Subject: [PATCH] bug fix and composite

---
 panda/src/nativenet/buffered_datagramreader.h | 2 +-
 panda/src/nativenet/nativenet_composite1.cxx  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100755 panda/src/nativenet/nativenet_composite1.cxx

diff --git a/panda/src/nativenet/buffered_datagramreader.h b/panda/src/nativenet/buffered_datagramreader.h
index 52db9602a2..baa99bd1e6 100755
--- a/panda/src/nativenet/buffered_datagramreader.h
+++ b/panda/src/nativenet/buffered_datagramreader.h
@@ -12,7 +12,7 @@ inline unsigned short GetUnsignedShort(char * in)
 
 class Buffered_DatagramReader : protected RingBuffer
 {
-	xinline bool GetMessageFromBuffer(Datagram &inmsg);
+	inline bool GetMessageFromBuffer(Datagram &inmsg);
 public:
 	inline Buffered_DatagramReader(int in_size = 8192) ;
 	inline void ReSet(void); 
diff --git a/panda/src/nativenet/nativenet_composite1.cxx b/panda/src/nativenet/nativenet_composite1.cxx
new file mode 100755
index 0000000000..511acbd454
--- /dev/null
+++ b/panda/src/nativenet/nativenet_composite1.cxx
@@ -0,0 +1,3 @@
+#include "socket_base.h"
+
+