diff options
| author | Michael Biebl <biebl@debian.org> | 2016-01-20 16:27:43 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-01-20 16:27:43 +0100 |
| commit | cbb3b57b5b60dbf1eadb795c834ac511f5e1ba21 (patch) | |
| tree | a97e7cf8b8903a2902c34f586661a13da2a9f2ea /src/nm-multi-index.h | |
| parent | 5ddbb9de1f57acaeb47a151404bcf5f8c9729276 (diff) | |
| parent | 494f296a3baab08522617b24b1f126d8f9a17502 (diff) | |
Merge tag 'upstream/1.1.90' into experimental
Upstream version 1.1.90
Diffstat (limited to 'src/nm-multi-index.h')
| -rw-r--r-- | src/nm-multi-index.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/nm-multi-index.h b/src/nm-multi-index.h index e41ef54e..1e1e8fda 100644 --- a/src/nm-multi-index.h +++ b/src/nm-multi-index.h @@ -21,7 +21,7 @@ #ifndef __NM_MULTI_INDEX__ #define __NM_MULTI_INDEX__ -#include <glib.h> +#include "nm-default.h" G_BEGIN_DECLS @@ -39,7 +39,10 @@ typedef struct { } NMMultiIndexIter; typedef struct { - GHashTableIter _iter; + union { + GHashTableIter _iter; + gpointer _value; + }; guint _state; } NMMultiIndexIdIter; |