diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-15 22:39:51 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-15 22:41:56 +0100 |
| commit | e90d606f0ad56146e8686acfdfd357005fa5b4a6 (patch) | |
| tree | 82a66550e4226a31b1ef0b332ac919e5fde9f823 /src | |
| parent | 5bb2d64ddb1aa9f7c3931bd00e2b4edcd1adfc5b (diff) | |
| download | mpd-e90d606f0ad56146e8686acfdfd357005fa5b4a6.tar.gz mpd-e90d606f0ad56146e8686acfdfd357005fa5b4a6.tar.xz mpd-e90d606f0ad56146e8686acfdfd357005fa5b4a6.zip | |
socket_util: convert to C++
Diffstat (limited to '')
| -rw-r--r-- | src/ServerSocket.cxx | 2 | ||||
| -rw-r--r-- | src/SocketUtil.cxx (renamed from src/socket_util.c) | 4 | ||||
| -rw-r--r-- | src/SocketUtil.hxx (renamed from src/socket_util.h) | 14 |
3 files changed, 6 insertions, 14 deletions
diff --git a/src/ServerSocket.cxx b/src/ServerSocket.cxx index 7127d3bdb..7f2853e20 100644 --- a/src/ServerSocket.cxx +++ b/src/ServerSocket.cxx @@ -24,7 +24,7 @@ #endif #include "ServerSocket.hxx" -#include "socket_util.h" +#include "SocketUtil.hxx" #include "resolver.h" #include "fd_util.h" #include "glib_socket.h" diff --git a/src/socket_util.c b/src/SocketUtil.cxx index ee8bf7e1a..6974c0df3 100644 --- a/src/socket_util.c +++ b/src/SocketUtil.cxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2011 The Music Player Daemon Project + * Copyright (C) 2003-2013 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ */ #include "config.h" -#include "socket_util.h" +#include "SocketUtil.hxx" #include "fd_util.h" #include <glib.h> diff --git a/src/socket_util.h b/src/SocketUtil.hxx index 3f602cd53..3d0be78c4 100644 --- a/src/socket_util.h +++ b/src/SocketUtil.hxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2011 The Music Player Daemon Project + * Copyright (C) 2003-2013 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -23,8 +23,8 @@ * */ -#ifndef SOCKET_UTIL_H -#define SOCKET_UTIL_H +#ifndef MPD_SOCKET_UTIL_HXX +#define MPD_SOCKET_UTIL_HXX #include "gerror.h" @@ -32,10 +32,6 @@ struct sockaddr; -#ifdef __cplusplus -extern "C" { -#endif - /** * Creates a socket listening on the specified address. This is a * shortcut for socket(), bind() and listen(). @@ -59,8 +55,4 @@ socket_bind_listen(int domain, int type, int protocol, int socket_keepalive(int fd); -#ifdef __cplusplus -} -#endif - #endif |