Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(195)

Side by Side Diff: include/opus_defines.h

Issue 11260035: Fix opus_defines.h to define OPUS_EXPORT only when it's not defined. (Closed) Base URL: http://git.chromium.org/chromium/deps/opus.git@master
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* Copyright (c) 2010-2011 Xiph.Org Foundation, Skype Limited 1 /* Copyright (c) 2010-2011 Xiph.Org Foundation, Skype Limited
2 Written by Jean-Marc Valin and Koen Vos */ 2 Written by Jean-Marc Valin and Koen Vos */
3 /* 3 /*
4 Redistribution and use in source and binary forms, with or without 4 Redistribution and use in source and binary forms, with or without
5 modification, are permitted provided that the following conditions 5 modification, are permitted provided that the following conditions
6 are met: 6 are met:
7 7
8 - Redistributions of source code must retain the above copyright 8 - Redistributions of source code must retain the above copyright
9 notice, this list of conditions and the following disclaimer. 9 notice, this list of conditions and the following disclaimer.
10 10
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 #define OPUS_UNIMPLEMENTED -5 56 #define OPUS_UNIMPLEMENTED -5
57 /** An encoder or decoder structure is invalid or already freed @hideinitializer */ 57 /** An encoder or decoder structure is invalid or already freed @hideinitializer */
58 #define OPUS_INVALID_STATE -6 58 #define OPUS_INVALID_STATE -6
59 /** Memory allocation has failed @hideinitializer*/ 59 /** Memory allocation has failed @hideinitializer*/
60 #define OPUS_ALLOC_FAIL -7 60 #define OPUS_ALLOC_FAIL -7
61 /**@}*/ 61 /**@}*/
62 62
63 /** @cond OPUS_INTERNAL_DOC */ 63 /** @cond OPUS_INTERNAL_DOC */
64 /**Export control for opus functions */ 64 /**Export control for opus functions */
65 65
66 #if !defined(OPUS_EXPORT)
67
66 #if defined(__GNUC__) && defined(OPUS_BUILD) 68 #if defined(__GNUC__) && defined(OPUS_BUILD)
67 # define OPUS_EXPORT __attribute__ ((visibility ("default"))) 69 # define OPUS_EXPORT __attribute__ ((visibility ("default")))
68 #elif defined(WIN32) && !defined(__MINGW32__) 70 #elif defined(WIN32) && !defined(__MINGW32__)
69 # ifdef OPUS_BUILD 71 # ifdef OPUS_BUILD
70 # define OPUS_EXPORT __declspec(dllexport) 72 # define OPUS_EXPORT __declspec(dllexport)
71 # else 73 # else
72 # define OPUS_EXPORT 74 # define OPUS_EXPORT
73 # endif 75 # endif
74 #else 76 #else
75 # define OPUS_EXPORT 77 # define OPUS_EXPORT
76 #endif 78 #endif
77 79
80 #endif
81
78 # if !defined(OPUS_GNUC_PREREQ) 82 # if !defined(OPUS_GNUC_PREREQ)
79 # if defined(__GNUC__)&&defined(__GNUC_MINOR__) 83 # if defined(__GNUC__)&&defined(__GNUC_MINOR__)
80 # define OPUS_GNUC_PREREQ(_maj,_min) \ 84 # define OPUS_GNUC_PREREQ(_maj,_min) \
81 ((__GNUC__<<16)+__GNUC_MINOR__>=((_maj)<<16)+(_min)) 85 ((__GNUC__<<16)+__GNUC_MINOR__>=((_maj)<<16)+(_min))
82 # else 86 # else
83 # define OPUS_GNUC_PREREQ(_maj,_min) 0 87 # define OPUS_GNUC_PREREQ(_maj,_min) 0
84 # endif 88 # endif
85 # endif 89 # endif
86 90
87 #if (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) ) 91 #if (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) )
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 * @returns Version string 629 * @returns Version string
626 */ 630 */
627 OPUS_EXPORT const char *opus_get_version_string(void); 631 OPUS_EXPORT const char *opus_get_version_string(void);
628 /**@}*/ 632 /**@}*/
629 633
630 #ifdef __cplusplus 634 #ifdef __cplusplus
631 } 635 }
632 #endif 636 #endif
633 637
634 #endif /* OPUS_DEFINES_H */ 638 #endif /* OPUS_DEFINES_H */
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698