diff options
author | Grant Erickson <marathon96@gmail.com> | 2015-12-08 18:09:02 +0200 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2015-12-09 12:23:22 +0200 |
commit | 2d65ef1d039511aaca1d4f69b3d9cdd89f811f9c (patch) | |
tree | c4eb5af0243dbbacc32c976fe3910824c11b90fe | |
parent | adc0103a067071ee03c8a728450ff4e211a0fbc8 (diff) | |
download | bluez-2d65ef1d039511aaca1d4f69b3d9cdd89f811f9c.tar.gz |
gdbus: Move typedefs for interwork with strict compilers
Move enumeration type defintions AFTER the enumerations themselves are
declared and defined such that the header works with strict compilers.
This occurs when building a plugin, compiled with C++, and occurs on
all of:
arm-none-linux-gnueabi-g++ (Sourcery G++ Lite 2010q1-202) 4.4.1
arm-poky-linux-gnueabi-g++ (GCC) 4.8.2
g++ (Ubuntu 4.8.4-2ubuntu1~14.04) 4.8.4
-rw-r--r-- | gdbus/gdbus.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index 9ece4b07c..69fbc107c 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -31,12 +31,6 @@ extern "C" { #include <dbus/dbus.h> #include <glib.h> -typedef enum GDBusMethodFlags GDBusMethodFlags; -typedef enum GDBusSignalFlags GDBusSignalFlags; -typedef enum GDBusPropertyFlags GDBusPropertyFlags; -typedef enum GDBusSecurityFlags GDBusSecurityFlags; -typedef enum GDbusPropertyChangedFlags GDbusPropertyChangedFlags; - typedef struct GDBusArgInfo GDBusArgInfo; typedef struct GDBusMethodTable GDBusMethodTable; typedef struct GDBusSignalTable GDBusSignalTable; @@ -120,6 +114,12 @@ enum GDbusPropertyChangedFlags { G_DBUS_PROPERTY_CHANGED_FLAG_FLUSH = (1 << 0), }; +typedef enum GDBusMethodFlags GDBusMethodFlags; +typedef enum GDBusSignalFlags GDBusSignalFlags; +typedef enum GDBusPropertyFlags GDBusPropertyFlags; +typedef enum GDBusSecurityFlags GDBusSecurityFlags; +typedef enum GDbusPropertyChangedFlags GDbusPropertyChangedFlags; + struct GDBusArgInfo { const char *name; const char *signature; |