aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Schink <swo-dev@marcschink.de>2017-07-15 19:07:12 +0200
committerMarc Schink <swo-dev@marcschink.de>2017-07-21 09:26:27 +0200
commit28ed4079c44c987726e01141ed268174f18475f8 (patch)
tree2d487adff47c4f1d62dcddaa05fb158ddfecf7a0
parent6c7c3a7ffb0d8d63922d7033de6a43bdb22e22bd (diff)
Minor cleanups
-rw-r--r--bindings/cxx/hardware.cpp1
-rw-r--r--bindings/cxx/libswocxx.h9
-rw-r--r--configure.ac2
3 files changed, 7 insertions, 5 deletions
diff --git a/bindings/cxx/hardware.cpp b/bindings/cxx/hardware.cpp
index 08ac307..eea8816 100644
--- a/bindings/cxx/hardware.cpp
+++ b/bindings/cxx/hardware.cpp
@@ -28,6 +28,7 @@ Hardware::Hardware(const struct libswo_packet_hw *packet)
{
_packet = *((const union libswo_packet *)packet);
}
+
Hardware::Hardware(const union libswo_packet *packet)
{
_packet = *packet;
diff --git a/bindings/cxx/libswocxx.h b/bindings/cxx/libswocxx.h
index 37ac1fa..cf36cff 100644
--- a/bindings/cxx/libswocxx.h
+++ b/bindings/cxx/libswocxx.h
@@ -86,6 +86,9 @@ enum class DecoderFlags {
const char LOG_DOMAIN_DEFAULT[] = LIBSWO_LOG_DOMAIN_DEFAULT;
const unsigned int LOG_DOMAIN_MAX_LENGTH = LIBSWO_LOG_DOMAIN_MAX_LENGTH;
+typedef int (*LogCallback)(LogLevel level, const std::string &message,
+ void *user_data);
+
class LIBSWO_API Error : public exception
{
public:
@@ -108,6 +111,8 @@ protected:
union libswo_packet _packet;
};
+typedef int (*DecoderCallback)(const Packet &packet, void *user_data);
+
class LIBSWO_API PayloadPacket : public Packet
{
public:
@@ -118,10 +123,6 @@ public:
static const unsigned int MAX_SIZE = LIBSWO_MAX_PAYLOAD_SIZE;
};
-typedef int (*DecoderCallback)(const Packet &packet, void *user_data);
-typedef int (*LogCallback)(LogLevel level, const std::string &message,
- void *user_data);
-
class LIBSWO_API Unknown : public PayloadPacket
{
public:
diff --git a/configure.ac b/configure.ac
index eec9069..8ea4165 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,7 @@ PKG_PROG_PKG_CONFIG
# Checks for library functions.
# Disable progress and informational output of libtool.
-AC_SUBST([AM_LIBTOOLFLAGS], '--silent')
+AC_SUBST([AM_LIBTOOLFLAGS], "--silent")
# Check for SWIG.
AC_CHECK_PROGS([SWIG], [swig swig3.0])