HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

api: rework GeanyProxyProbeResults compat symbols as defines

Browse Source 
Constants with different namespace in the same enum confuse g-ir-scanner.
This commit is contained in:
Thomas Martitz 2016-12-28 00:30:54 +01:00
parent cad224d204
commit 129389c75b
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugindata.h
View File

@ -345,29 +345,17 @@ void geany_plugin_set_data(GeanyPlugin *plugin, gpointer data, GDestroyNotify fr
*/ */
typedef enum typedef enum
{ {
/** @deprecated Use GEANY_PROXY_IGNORE instead.
* @since 1.26 (API 226)
*/
PROXY_IGNORED,
/** @deprecated Use GEANY_PROXY_MATCH instead.
* @since 1.26 (API 226)
*/
PROXY_MATCHED,
/** @deprecated Use GEANY_PROXY_RELATED instead.
* @since 1.26 (API 226)
*/
PROXY_NOLOAD = 0x100,
/** The proxy is not responsible at all, and Geany or other plugins are free /** The proxy is not responsible at all, and Geany or other plugins are free
* to probe it. * to probe it.
* *
* @since 1.29 (API 229) * @since 1.29 (API 229)
**/ **/
GEANY_PROXY_IGNORE = PROXY_IGNORED, GEANY_PROXY_IGNORE,
/** The proxy is responsible for this file, and creates a plugin for it. /** The proxy is responsible for this file, and creates a plugin for it.
* *
* @since 1.29 (API 229) * @since 1.29 (API 229)
*/ */
GEANY_PROXY_MATCH = PROXY_MATCHED, GEANY_PROXY_MATCH,
/** The proxy is does not directly load it, but it's still tied to the proxy. /** The proxy is does not directly load it, but it's still tied to the proxy.
* *
* This is for plugins that come in multiple files where only one of these * This is for plugins that come in multiple files where only one of these
@ -378,10 +366,22 @@ typedef enum
* *
* @since 1.29 (API 229) * @since 1.29 (API 229)
*/ */
GEANY_PROXY_RELATED = PROXY_MATCHED | PROXY_NOLOAD GEANY_PROXY_RELATED = GEANY_PROXY_MATCH | 0x100
} }
GeanyProxyProbeResults; GeanyProxyProbeResults;
/** @deprecated Use GEANY_PROXY_IGNORE instead.
* @since 1.26 (API 226)
*/
#define PROXY_IGNORED GEANY_PROXY_IGNORE
/** @deprecated Use GEANY_PROXY_MATCH instead.
* @since 1.26 (API 226)
*/
#define PROXY_MATCHED GEANY_PROXY_MATCH
/** @deprecated Use GEANY_PROXY_RELATED instead.
* @since 1.26 (API 226)
*/
#define PROXY_NOLOAD 0x100
/** Hooks that need to be implemented by every proxy /** Hooks that need to be implemented by every proxy
* *