diff options
| author | Anand Avati <avati@gluster.com> | 2010-07-14 16:26:17 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2010-07-14 15:02:50 -0700 |
| commit | 47dc8def246c6338cb95e71b4656962a5f74ee90 (patch) | |
| tree | c627dd8f4c0743eccd85143be1399a1e505b95f2 /rpc/rpc-transport/socket | |
| parent | 2865e149c48eb5ed028cffb12e1e5273b47f2b1d (diff) | |
protocol/lib: rename files to standardized names and places
- move xlators/protocol/lib/* to rpc/xdr/
- rename CLI and glusterd XDR filenames
- remove xlators/protocol/lib (libgfproto1.so)
Signed-off-by: Anand V. Avati <avati@blackhole.gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
BUG: 875 (Implement a new protocol to provide proper backward/forward compatibility)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=875
Diffstat (limited to 'rpc/rpc-transport/socket')
| -rw-r--r-- | rpc/rpc-transport/socket/src/Makefile.am | 2 | ||||
| -rw-r--r-- | rpc/rpc-transport/socket/src/socket.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/rpc/rpc-transport/socket/src/Makefile.am b/rpc/rpc-transport/socket/src/Makefile.am index 46a3e12378b..2c918c7e313 100644 --- a/rpc/rpc-transport/socket/src/Makefile.am +++ b/rpc/rpc-transport/socket/src/Makefile.am @@ -10,6 +10,6 @@ socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src/ \ - -I$(top_srcdir)/xlators/protocol/lib/src/ -shared -nostartfiles $(GF_CFLAGS) + -I$(top_srcdir)/rpc/xdr/src/ -shared -nostartfiles $(GF_CFLAGS) CLEANFILES = *~ diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index 4ca7121e8af..b40a93ee821 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -32,9 +32,12 @@ #include "byte-order.h" #include "common-utils.h" #include "compat-errno.h" + + +/* ugly #includes below */ #include "protocol-common.h" +#include "glusterfs3-xdr.h" -#include "glusterfs-xdr.h" #include <fcntl.h> #include <errno.h> #include <netinet/tcp.h> |