You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2013/01/11 11:43:25 UTC
[1/6] THRIFT-1826 update c_glib source header paths Patch: Simon South
http://git-wip-us.apache.org/repos/asf/thrift/blob/e3da7683/lib/c_glib/test/testbufferedtransport.c
----------------------------------------------------------------------
diff --git a/lib/c_glib/test/testbufferedtransport.c b/lib/c_glib/test/testbufferedtransport.c
old mode 100644
new mode 100755
index d04343e..86b5314
--- a/lib/c_glib/test/testbufferedtransport.c
+++ b/lib/c_glib/test/testbufferedtransport.c
@@ -20,14 +20,14 @@
#include <assert.h>
#include <netdb.h>
-#include <thrift/transport/thrift_transport.h>
-#include <thrift/transport/thrift_socket.h>
-#include <thrift/transport/thrift_server_transport.h>
-#include <thrift/transport/thrift_server_socket.h>
+#include <thrift/c_glib/transport/thrift_transport.h>
+#include <thrift/c_glib/transport/thrift_socket.h>
+#include <thrift/c_glib/transport/thrift_server_transport.h>
+#include <thrift/c_glib/transport/thrift_server_socket.h>
#define TEST_DATA { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j' }
-#include "../src/thrift/transport/thrift_buffered_transport.c"
+#include "../src/thrift/c_glib/transport/thrift_buffered_transport.c"
static const char TEST_ADDRESS[] = "localhost";
static const short TEST_PORT = 64444;
http://git-wip-us.apache.org/repos/asf/thrift/blob/e3da7683/lib/c_glib/test/testframedtransport.c
----------------------------------------------------------------------
diff --git a/lib/c_glib/test/testframedtransport.c b/lib/c_glib/test/testframedtransport.c
old mode 100644
new mode 100755
index dcaabda..03c9f9b
--- a/lib/c_glib/test/testframedtransport.c
+++ b/lib/c_glib/test/testframedtransport.c
@@ -20,14 +20,14 @@
#include <assert.h>
#include <netdb.h>
-#include <thrift/transport/thrift_transport.h>
-#include <thrift/transport/thrift_socket.h>
-#include <thrift/transport/thrift_server_transport.h>
-#include <thrift/transport/thrift_server_socket.h>
+#include <thrift/c_glib/transport/thrift_transport.h>
+#include <thrift/c_glib/transport/thrift_socket.h>
+#include <thrift/c_glib/transport/thrift_server_transport.h>
+#include <thrift/c_glib/transport/thrift_server_socket.h>
#define TEST_DATA { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j' }
-#include "../src/thrift/transport/thrift_framed_transport.c"
+#include "../src/thrift/c_glib/transport/thrift_framed_transport.c"
static const char TEST_ADDRESS[] = "localhost";
static const short TEST_PORT = 64444;
http://git-wip-us.apache.org/repos/asf/thrift/blob/e3da7683/lib/c_glib/test/testmemorybuffer.c
----------------------------------------------------------------------
diff --git a/lib/c_glib/test/testmemorybuffer.c b/lib/c_glib/test/testmemorybuffer.c
old mode 100644
new mode 100755
index 9698185..7169a5c
--- a/lib/c_glib/test/testmemorybuffer.c
+++ b/lib/c_glib/test/testmemorybuffer.c
@@ -20,14 +20,14 @@
#include <assert.h>
#include <netdb.h>
-#include <thrift/transport/thrift_transport.h>
-#include <thrift/transport/thrift_socket.h>
-#include <thrift/transport/thrift_server_transport.h>
-#include <thrift/transport/thrift_server_socket.h>
+#include <thrift/c_glib/transport/thrift_transport.h>
+#include <thrift/c_glib/transport/thrift_socket.h>
+#include <thrift/c_glib/transport/thrift_server_transport.h>
+#include <thrift/c_glib/transport/thrift_server_socket.h>
#define TEST_DATA { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j' }
-#include "../src/thrift/transport/thrift_memory_buffer.c"
+#include "../src/thrift/c_glib/transport/thrift_memory_buffer.c"
/* test object creation and destruction */
static void
http://git-wip-us.apache.org/repos/asf/thrift/blob/e3da7683/lib/c_glib/test/testoptionalrequired.c
----------------------------------------------------------------------
diff --git a/lib/c_glib/test/testoptionalrequired.c b/lib/c_glib/test/testoptionalrequired.c
old mode 100644
new mode 100755
index 4f6fe15..2839dd4
--- a/lib/c_glib/test/testoptionalrequired.c
+++ b/lib/c_glib/test/testoptionalrequired.c
@@ -20,10 +20,10 @@
#include <assert.h>
#include <glib.h>
-#include <thrift/thrift_struct.h>
-#include <thrift/protocol/thrift_protocol.h>
-#include <thrift/protocol/thrift_binary_protocol.h>
-#include <thrift/transport/thrift_memory_buffer.h>
+#include <thrift/c_glib/thrift_struct.h>
+#include <thrift/c_glib/protocol/thrift_protocol.h>
+#include <thrift/c_glib/protocol/thrift_binary_protocol.h>
+#include <thrift/c_glib/transport/thrift_memory_buffer.h>
#include "gen-c_glib/t_test_optional_required_test_types.h"
#include "gen-c_glib/t_test_optional_required_test_types.c"
http://git-wip-us.apache.org/repos/asf/thrift/blob/e3da7683/lib/c_glib/test/testsimpleserver.c
----------------------------------------------------------------------
diff --git a/lib/c_glib/test/testsimpleserver.c b/lib/c_glib/test/testsimpleserver.c
old mode 100644
new mode 100755
index 6f7d3a4..fca2dcd
--- a/lib/c_glib/test/testsimpleserver.c
+++ b/lib/c_glib/test/testsimpleserver.c
@@ -24,13 +24,13 @@
#include <sys/types.h>
#include <sys/wait.h>
-#include <thrift/thrift.h>
-#include <thrift/processor/thrift_processor.h>
-#include <thrift/transport/thrift_server_socket.h>
+#include <thrift/c_glib/thrift.h>
+#include <thrift/c_glib/processor/thrift_processor.h>
+#include <thrift/c_glib/transport/thrift_server_socket.h>
#define TEST_PORT 51199
-#include <thrift/server/thrift_simple_server.c>
+#include <thrift/c_glib/server/thrift_simple_server.c>
/* create a rudimentary processor */
#define TEST_PROCESSOR_TYPE (test_processor_get_type ())
http://git-wip-us.apache.org/repos/asf/thrift/blob/e3da7683/lib/c_glib/test/teststruct.c
----------------------------------------------------------------------
diff --git a/lib/c_glib/test/teststruct.c b/lib/c_glib/test/teststruct.c
old mode 100644
new mode 100755
index 50b10dc..182a6ac
--- a/lib/c_glib/test/teststruct.c
+++ b/lib/c_glib/test/teststruct.c
@@ -20,7 +20,7 @@
#include <assert.h>
#include <glib-object.h>
-#include "../src/thrift/thrift_struct.c"
+#include "../src/thrift/c_glib/thrift_struct.c"
/* tests to ensure we can extend a ThriftStruct */
http://git-wip-us.apache.org/repos/asf/thrift/blob/e3da7683/lib/c_glib/test/testthrifttest.c
----------------------------------------------------------------------
diff --git a/lib/c_glib/test/testthrifttest.c b/lib/c_glib/test/testthrifttest.c
old mode 100644
new mode 100755
index 806166e..a42d089
--- a/lib/c_glib/test/testthrifttest.c
+++ b/lib/c_glib/test/testthrifttest.c
@@ -1,8 +1,8 @@
#include <assert.h>
#include <netdb.h>
-#include <thrift/transport/thrift_server_transport.h>
-#include <thrift/transport/thrift_server_socket.h>
+#include <thrift/c_glib/transport/thrift_server_transport.h>
+#include <thrift/c_glib/transport/thrift_server_socket.h>
static const char TEST_ADDRESS[] = "localhost";
static const int TEST_PORT = 64444;
http://git-wip-us.apache.org/repos/asf/thrift/blob/e3da7683/lib/c_glib/test/testthrifttestclient.cpp
----------------------------------------------------------------------
diff --git a/lib/c_glib/test/testthrifttestclient.cpp b/lib/c_glib/test/testthrifttestclient.cpp
old mode 100644
new mode 100755
index 5d40331..48ece70
--- a/lib/c_glib/test/testthrifttestclient.cpp
+++ b/lib/c_glib/test/testthrifttestclient.cpp
@@ -314,9 +314,9 @@ extern "C" {
#include "t_test_thrift_test.h"
#include "t_test_thrift_test_types.h"
-#include <thrift/transport/thrift_socket.h>
-#include <thrift/protocol/thrift_protocol.h>
-#include <thrift/protocol/thrift_binary_protocol.h>
+#include <thrift/c_glib/transport/thrift_socket.h>
+#include <thrift/c_glib/protocol/thrift_protocol.h>
+#include <thrift/c_glib/protocol/thrift_binary_protocol.h>
static void
test_thrift_client (void)
http://git-wip-us.apache.org/repos/asf/thrift/blob/e3da7683/lib/c_glib/test/testtransportsocket.c
----------------------------------------------------------------------
diff --git a/lib/c_glib/test/testtransportsocket.c b/lib/c_glib/test/testtransportsocket.c
old mode 100644
new mode 100755
index 41e0ea4..836ddd0
--- a/lib/c_glib/test/testtransportsocket.c
+++ b/lib/c_glib/test/testtransportsocket.c
@@ -20,9 +20,9 @@
#include <assert.h>
#include <netdb.h>
-#include <thrift/transport/thrift_transport.h>
-#include <thrift/transport/thrift_server_transport.h>
-#include <thrift/transport/thrift_server_socket.h>
+#include <thrift/c_glib/transport/thrift_transport.h>
+#include <thrift/c_glib/transport/thrift_server_transport.h>
+#include <thrift/c_glib/transport/thrift_server_socket.h>
#define TEST_DATA { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j' }
@@ -63,7 +63,7 @@ my_send(int socket, const void *buffer, size_t length, int flags)
#define socket my_socket
#define recv my_recv
#define send my_send
-#include "../src/thrift/transport/thrift_socket.c"
+#include "../src/thrift/c_glib/transport/thrift_socket.c"
#undef socket
#undef recv
#undef send
http://git-wip-us.apache.org/repos/asf/thrift/blob/e3da7683/lib/c_glib/thrift_c_glib.pc.in
----------------------------------------------------------------------
diff --git a/lib/c_glib/thrift_c_glib.pc.in b/lib/c_glib/thrift_c_glib.pc.in
index 1377203..3921d05 100644
--- a/lib/c_glib/thrift_c_glib.pc.in
+++ b/lib/c_glib/thrift_c_glib.pc.in
@@ -27,4 +27,4 @@ Description: Thrift C API
Version: @VERSION@
Requires: glib-2.0 gobject-2.0
Libs: -L${libdir} -lthrift_c_glib
-Cflags: -I${includedir}/thrift
+Cflags: -I${includedir}/thrift/c_glib