song_sort: convert to C++

src/Directory.cxx

@@ -22,10 +22,10 @@
 #include "SongFilter.hxx"
 #include "PlaylistVector.hxx"
 #include "DatabaseLock.hxx"
+#include "SongSort.hxx"
 
 extern "C" {
 #include "song.h"
-#include "song_sort.h"
 #include "util/list_sort.h"
 }
 

src/SongSort.cxx

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2012 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,12 +18,15 @@
  */
 
 #include "config.h"
-#include "song_sort.h"
+#include "SongSort.hxx"
 #include "song.h"
 #include "util/list.h"
-#include "util/list_sort.h"
 #include "tag.h"
 
+extern "C" {
+#include "util/list_sort.h"
+}
+
 #include <glib.h>
 
 #include <assert.h>

src/SongSort.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2012 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
@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPD_SONG_SORT_H
-#define MPD_SONG_SORT_H
+#ifndef MPD_SONG_SORT_HXX
+#define MPD_SONG_SORT_HXX
 
 struct list_head;