|
 |
cb8e9e |
From 6b9d0145a7a43bf7f7c756ccc19157fc7b2e36e0 Mon Sep 17 00:00:00 2001
|
|
|
cb8e9e |
From: Kaleb S. KEITHLEY <kkeithle@redhat.com>
|
|
|
cb8e9e |
Date: Wed, 19 Aug 2015 02:43:00 -0400
|
|
|
cb8e9e |
Subject: [PATCH 304/304] libgfapi: non-default symbol version macros are incorrect
|
|
|
cb8e9e |
|
|
|
cb8e9e |
default symbol versions are in form glfs_h_lookupat@@GFAPI_2.7.4,
|
|
|
cb8e9e |
versus old, non-default versions are in the form glfs_h_lookup@GFAPI_2.4.2
|
|
|
cb8e9e |
|
|
|
cb8e9e |
I.e. "@@" versus "@"
|
|
|
cb8e9e |
|
|
|
cb8e9e |
Backport of:
|
|
|
cb8e9e |
* Change-Id: I88a6b129558c0b3a6064de7620b3b20425e80bc9
|
|
|
cb8e9e |
* BUG: 1254863
|
|
|
cb8e9e |
* http://review.gluster.org/#/c/11955/
|
|
|
cb8e9e |
|
|
|
cb8e9e |
BUG: 1257007
|
|
|
cb8e9e |
Change-Id: I394fb92b9d47790e57e1586b1631f3a31f4aa2d8
|
|
|
cb8e9e |
Author: Kaleb S. KEITHLEY <kkeithle@redhat.com>
|
|
|
cb8e9e |
Signed-off-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
cb8e9e |
Reviewed-on: http://review.gluster.org/11955
|
|
|
cb8e9e |
Reviewed-by: Niels de Vos <ndevos@redhat.com>
|
|
|
cb8e9e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/56460
|
|
|
cb8e9e |
Reviewed-by: Jiffin Thottan <jthottan@redhat.com>
|
|
|
cb8e9e |
---
|
|
|
cb8e9e |
api/src/glfs-internal.h | 4 ++--
|
|
|
cb8e9e |
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
cb8e9e |
|
|
|
cb8e9e |
diff --git a/api/src/glfs-internal.h b/api/src/glfs-internal.h
|
|
|
cb8e9e |
index 2d8a7dc..93e72a3 100644
|
|
|
cb8e9e |
--- a/api/src/glfs-internal.h
|
|
|
cb8e9e |
+++ b/api/src/glfs-internal.h
|
|
|
cb8e9e |
@@ -35,10 +35,10 @@
|
|
|
cb8e9e |
asm(".symver priv_"STR(fn)", "STR(fn)"@@GFAPI_PRIVATE_"STR(ver))
|
|
|
cb8e9e |
|
|
|
cb8e9e |
#define GFAPI_SYMVER_PUBLIC(fn1, fn2, ver) \
|
|
|
cb8e9e |
- asm(".symver pub_"STR(fn1)", "STR(fn2)"@@GFAPI_"STR(ver))
|
|
|
cb8e9e |
+ asm(".symver pub_"STR(fn1)", "STR(fn2)"@GFAPI_"STR(ver))
|
|
|
cb8e9e |
|
|
|
cb8e9e |
#define GFAPI_SYMVER_PRIVATE(fn1, fn2, ver) \
|
|
|
cb8e9e |
- asm(".symver priv_"STR(fn1)", "STR(fn2)"@@GFAPI_PRIVATE_"STR(ver))
|
|
|
cb8e9e |
+ asm(".symver priv_"STR(fn1)", "STR(fn2)"@GFAPI_PRIVATE_"STR(ver))
|
|
|
cb8e9e |
#define STR(str) #str
|
|
|
cb8e9e |
#else
|
|
|
cb8e9e |
#ifndef GFAPI_PUBLIC
|
|
|
cb8e9e |
--
|
|
|
cb8e9e |
1.7.1
|
|
|
cb8e9e |
|