pidgin/pidgin

Move common_sockaddr_t back to purpleprivate.h and ignore purpleprivate.h from the docs.

2020-05-11, Gary Kramlich
80d1a092cf5e
Parents e9838d634d5e
Children f23c7e772667
Move common_sockaddr_t back to purpleprivate.h and ignore purpleprivate.h from the docs.
3 files changed, 9 insertions(+), 8 deletions(-)
  • +1 -0
    doc/reference/libpurple/meson.build
  • +0 -8
    libpurple/network.h
  • +8 -0
    libpurple/purpleprivate.h
    • --- a/doc/reference/libpurple/meson.build Fri May 01 12:13:35 2020 -0500
    +++ b/doc/reference/libpurple/meson.build Mon May 11 22:31:08 2020 -0500
    @@ -9,6 +9,7 @@
    'win32',
    'backend-fs2.h',
    'internal.h',
    + 'purpleprivate.h',
    ]
    # Extra options to supply to gtkdoc-scan.
    --- a/libpurple/network.h Fri May 01 12:13:35 2020 -0500
    +++ b/libpurple/network.h Mon May 11 22:31:08 2020 -0500
    @@ -36,14 +36,6 @@
    # include <sys/socket.h>
    #endif
    -typedef union
    -{
    - struct sockaddr sa;
    - struct sockaddr_in in;
    - struct sockaddr_in6 in6;
    - struct sockaddr_storage storage;
    -} common_sockaddr_t;
    -
    G_BEGIN_DECLS
    /**************************************************************************/
    --- a/libpurple/purpleprivate.h Fri May 01 12:13:35 2020 -0500
    +++ b/libpurple/purpleprivate.h Mon May 11 22:31:08 2020 -0500
    @@ -38,6 +38,14 @@
    #define PURPLE_ASSERT_CONNECTION_IS_VALID(gc) \
    _purple_assert_connection_is_valid(gc, __FILE__, __LINE__)
    +typedef union
    +{
    + struct sockaddr sa;
    + struct sockaddr_in in;
    + struct sockaddr_in6 in6;
    + struct sockaddr_storage storage;
    +} common_sockaddr_t;
    +
    G_BEGIN_DECLS
    /**