summaryrefslogtreecommitdiffstats
path: root/include/FLAC/export.h
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2014-07-25 05:33:22 -0700
committerSteve Kondik <shade@chemlab.org>2014-07-25 05:33:22 -0700
commita05c01b7806ce0ff2b110ad36dbfe5727cb8cd4f (patch)
treea5d0d048e3976331e7001ed2eea256c67dc10b2a /include/FLAC/export.h
parentd3c04b5f963ef86e1aeb74656151f175aefa4c48 (diff)
downloadandroid_external_flac-cm-11.0-XNPH44S-bacon-5fa8c79c0b.tar.gz
android_external_flac-cm-11.0-XNPH44S-bacon-5fa8c79c0b.tar.bz2
android_external_flac-cm-11.0-XNPH44S-bacon-5fa8c79c0b.zip
Change-Id: Ibd991640b7c85a96f4d1a43381acd199a6d197fd
Diffstat (limited to 'include/FLAC/export.h')
-rw-r--r--include/FLAC/export.h22
1 files changed, 14 insertions, 8 deletions
diff --git a/include/FLAC/export.h b/include/FLAC/export.h
index a525f29..2232b41 100644
--- a/include/FLAC/export.h
+++ b/include/FLAC/export.h
@@ -1,5 +1,6 @@
/* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007 Josh Coalson
+ * Copyright (C) 2000-2009 Josh Coalson
+ * Copyright (C) 2011-2013 Xiph.Org Foundation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -55,25 +56,30 @@
* \{
*/
-#if defined(FLAC__NO_DLL) || !defined(_MSC_VER)
+#if defined(FLAC__NO_DLL)
#define FLAC_API
-#else
-
+#elif defined(_MSC_VER)
#ifdef FLAC_API_EXPORTS
#define FLAC_API _declspec(dllexport)
#else
#define FLAC_API _declspec(dllimport)
-
#endif
+
+#elif defined(FLAC__USE_VISIBILITY_ATTR)
+#define FLAC_API __attribute__ ((visibility ("default")))
+
+#else
+#define FLAC_API
+
#endif
/** These #defines will mirror the libtool-based library version number, see
- * http://www.gnu.org/software/libtool/manual.html#Libtool-versioning
+ * http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning
*/
-#define FLAC_API_VERSION_CURRENT 10
+#define FLAC_API_VERSION_CURRENT 11
#define FLAC_API_VERSION_REVISION 0 /**< see above */
-#define FLAC_API_VERSION_AGE 2 /**< see above */
+#define FLAC_API_VERSION_AGE 3 /**< see above */
#ifdef __cplusplus
extern "C" {