From 6b9d0145a7a43bf7f7c756ccc19157fc7b2e36e0 Mon Sep 17 00:00:00 2001
From: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Date: Wed, 19 Aug 2015 02:43:00 -0400
Subject: [PATCH 304/304] libgfapi: non-default symbol version macros are incorrect

default symbol versions are in form glfs_h_lookupat@@GFAPI_2.7.4,
versus old, non-default versions are in the form glfs_h_lookup@GFAPI_2.4.2

I.e. "@@" versus "@"

Backport of:
* Change-Id: I88a6b129558c0b3a6064de7620b3b20425e80bc9
* BUG: 1254863
* http://review.gluster.org/#/c/11955/

BUG: 1257007
Change-Id: I394fb92b9d47790e57e1586b1631f3a31f4aa2d8
Author: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Signed-off-by: Soumya Koduri <skoduri@redhat.com>
Reviewed-on: http://review.gluster.org/11955
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/56460
Reviewed-by: Jiffin Thottan <jthottan@redhat.com>
---
 api/src/glfs-internal.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/src/glfs-internal.h b/api/src/glfs-internal.h
index 2d8a7dc..93e72a3 100644
--- a/api/src/glfs-internal.h
+++ b/api/src/glfs-internal.h
@@ -35,10 +35,10 @@
         asm(".symver priv_"STR(fn)", "STR(fn)"@@GFAPI_PRIVATE_"STR(ver))
 
 #define GFAPI_SYMVER_PUBLIC(fn1, fn2, ver) \
-        asm(".symver pub_"STR(fn1)", "STR(fn2)"@@GFAPI_"STR(ver))
+        asm(".symver pub_"STR(fn1)", "STR(fn2)"@GFAPI_"STR(ver))
 
 #define GFAPI_SYMVER_PRIVATE(fn1, fn2, ver) \
-        asm(".symver priv_"STR(fn1)", "STR(fn2)"@@GFAPI_PRIVATE_"STR(ver))
+        asm(".symver priv_"STR(fn1)", "STR(fn2)"@GFAPI_PRIVATE_"STR(ver))
 #define STR(str) #str
 #else
 #ifndef GFAPI_PUBLIC
-- 
1.7.1