| リビジョン | 069f4299900e3cc0ffa73539e7d41a781f98ce9b (tree) |
|---|---|
| 日時 | 2012-07-15 05:33:23 |
| 作者 | Matthias Clasen <mclasen@redh...> |
| コミッター | Matthias Clasen |
Fix GModule documentation a bit
The documentation for g_module_make_resident was for some reason
in the doc comment for g_module_name.
gmodule/gmodule.c (diff)
gmodule/gmodule.h (diff)| @@ -779,6 +779,13 @@ g_module_close (GModule *module) | ||
| 779 | 779 | return g_module_error() == NULL; |
| 780 | 780 | } |
| 781 | 781 | |
| 782 | +/** | |
| 783 | + * g_module_make_resident: | |
| 784 | + * @module: a #GModule to make permanently resident | |
| 785 | + * | |
| 786 | + * Ensures that a module will never be unloaded. | |
| 787 | + * Any future g_module_close() calls on the module will be ignored. | |
| 788 | + */ | |
| 782 | 789 | void |
| 783 | 790 | g_module_make_resident (GModule *module) |
| 784 | 791 | { |
| @@ -857,10 +864,13 @@ g_module_symbol (GModule *module, | ||
| 857 | 864 | |
| 858 | 865 | /** |
| 859 | 866 | * g_module_name: |
| 860 | - * @module: a #GModule to make permanently resident | |
| 867 | + * @module: a #GModule | |
| 861 | 868 | * |
| 862 | - * Ensures that a module will never be unloaded. | |
| 863 | - * Any future g_module_close() calls on the module will be ignored. | |
| 869 | + * Returns the filename that the module was opened with. | |
| 870 | + * | |
| 871 | + * If @module refers to the application itself, "main" is returned. | |
| 872 | + * | |
| 873 | + * Returns: (transfer none): the filename of the module | |
| 864 | 874 | */ |
| 865 | 875 | const gchar * |
| 866 | 876 | g_module_name (GModule *module) |
| @@ -52,10 +52,12 @@ typedef struct _GModule GModule; | ||
| 52 | 52 | typedef const gchar* (*GModuleCheckInit) (GModule *module); |
| 53 | 53 | typedef void (*GModuleUnload) (GModule *module); |
| 54 | 54 | |
| 55 | +#ifndef __GTK_DOC_IGNORE__ | |
| 55 | 56 | #ifdef G_OS_WIN32 |
| 56 | 57 | #define g_module_open g_module_open_utf8 |
| 57 | 58 | #define g_module_name g_module_name_utf8 |
| 58 | 59 | #endif |
| 60 | +#endif | |
| 59 | 61 | |
| 60 | 62 | /* return TRUE if dynamic module loading is supported */ |
| 61 | 63 | gboolean g_module_supported (void) G_GNUC_CONST; |
Android-x86
Fork