aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am5
-rw-r--r--src/ServerSocket.cxx2
-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
4 files changed, 8 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am
index 9782cef5b..875ea4ccc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -124,7 +124,6 @@ mpd_headers = \
src/TimePrint.cxx src/TimePrint.hxx \
src/song.h \
src/song_sort.c src/song_sort.h \
- src/socket_util.h \
src/stats.h \
src/tag.h \
src/tag_internal.h \
@@ -280,7 +279,7 @@ src_mpd_SOURCES = \
src/SongPrint.cxx src/SongPrint.hxx \
src/SongSave.cxx src/SongSave.hxx \
src/resolver.c src/resolver.h \
- src/socket_util.c \
+ src/SocketUtil.cxx src/SocketUtil.hxx \
src/StateFile.cxx src/StateFile.hxx \
src/Stats.cxx \
src/Tag.cxx \
@@ -1288,7 +1287,7 @@ test_run_output_SOURCES = test/run_output.cxx \
src/timer.c src/clock.c \
src/Tag.cxx src/TagNames.c src/TagPool.cxx \
src/page.c \
- src/socket_util.c \
+ src/SocketUtil.cxx \
src/resolver.c \
src/OutputInit.cxx src/OutputFinish.cxx src/OutputList.cxx \
src/OutputPlugin.cxx \
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