From 96ae032a9cb9b198f31e26aba30a39e5148a2ba4 Mon Sep 17 00:00:00 2001 From: Vijay Bellur Date: Fri, 18 Dec 2009 12:38:04 +0000 Subject: Support for Compilation on Solaris This is based on patch at: http://node3.rnode.ru/glusterfs-3.0.0-p1.patch Thanks to Petrunin Egor for this patch. Signed-off-by: Vijay Bellur Signed-off-by: Vijay Bellur BUG: 481 (Fix compilation failures in Solaris) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=481 --- libglusterfsclient/src/Makefile.am | 2 +- libglusterfsclient/src/libglusterfsclient.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'libglusterfsclient') diff --git a/libglusterfsclient/src/Makefile.am b/libglusterfsclient/src/Makefile.am index 531f1fbb9..32811c0d5 100644 --- a/libglusterfsclient/src/Makefile.am +++ b/libglusterfsclient/src/Makefile.am @@ -4,7 +4,7 @@ libglusterfsclient_HEADERS = libglusterfsclient.h libglusterfsclientdir = $(includedir) libglusterfsclient_la_SOURCES = libglusterfsclient.c libglusterfsclient-dentry.c -libglusterfsclient_la_CFLAGS = -fPIC -Wall -pthread +libglusterfsclient_la_CFLAGS = -fPIC -Wall libglusterfsclient_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la libglusterfsclient_la_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D$(GF_HOST_OS) -D__USE_FILE_OFFSET64 -D_GNU_SOURCE -I$(top_srcdir)/libglusterfs/src -DDATADIR=\"$(localstatedir)\" -DCONFDIR=\"$(sysconfdir)/glusterfs\" $(GF_CFLAGS) libglusterfsclient_la_LDFLAGS = -shared -nostartfiles diff --git a/libglusterfsclient/src/libglusterfsclient.c b/libglusterfsclient/src/libglusterfsclient.c index 692f46d92..0e12d81ad 100755 --- a/libglusterfsclient/src/libglusterfsclient.c +++ b/libglusterfsclient/src/libglusterfsclient.c @@ -44,7 +44,9 @@ #include "libglusterfsclient-internals.h" #include "compat.h" #include "compat-errno.h" +#ifndef GF_SOLARIS_HOST_OS #include +#endif #include #include #include -- cgit