main: use C++ compiler

Makefile.am

@@ -124,7 +124,6 @@ mpd_headers = \
 	src/listen.h \
 	src/log.h \
 	src/ls.h \
-	src/main.h \
 	src/mixer_all.h \
 	src/mixer_api.h \
 	src/mixer_control.h \
@@ -300,8 +299,8 @@ src_mpd_SOURCES = \
 	src/log.c \
 	src/ls.c \
 	src/io_thread.c src/io_thread.h \
-	src/main.c \
-	src/main_win32.c \
+	src/Main.cxx src/Main.hxx \
+	src/Win32Main.cxx \
 	src/event_pipe.c \
 	src/daemon.c \
 	src/AudioCompress/compress.c \
@@ -356,7 +355,7 @@ src_mpd_SOURCES = \
 	src/string_util.c \
 	src/volume.c \
 	src/SongFilter.cxx src/SongFilter.hxx \
-	src/PlaylistFile.cxx src/PlaylistFile.h \
+	src/PlaylistFile.cxx src/PlaylistFile.hxx \
 	src/timer.c
 
 #

src/DatabasePlaylist.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "DatabasePlaylist.hxx"
 #include "DatabaseSelection.hxx"
-#include "PlaylistFile.h"
+#include "PlaylistFile.hxx"
 #include "DatabaseGlue.hxx"
 #include "DatabasePlugin.hxx"
 

src/main.c → src/Main.cxx

 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2012 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,11 @@
  */
 
 #include "config.h"
-#include "main.h"
+#include "Main.hxx"
+#include "PlaylistFile.hxx"
+#include "chunk.h"
+
+extern "C" {
 #include "daemon.h"
 #include "io_thread.h"
 #include "client.h"
@@ -26,7 +30,6 @@
 #include "idle.h"
 #include "AllCommands.h"
 #include "playlist.h"
-#include "PlaylistFile.h"
 #include "database.h"
 #include "update.h"
 #include "player_thread.h"
@@ -35,7 +38,6 @@
 #include "conf.h"
 #include "path.h"
 #include "mapper.h"
-#include "chunk.h"
 #include "player_control.h"
 #include "stats.h"
 #include "sig_handlers.h"
@@ -53,8 +55,12 @@
 #include "tag.h"
 #include "zeroconf.h"
 #include "event_pipe.h"
+}
+
 #include "mpd_error.h"
 
+extern "C" {
+
 #ifdef ENABLE_INOTIFY
 #include "inotify_update.h"
 #endif
@@ -67,6 +73,8 @@
 #include "archive_list.h"
 #endif
 
+}
+
 #include <glib.h>
 
 #include <unistd.h>

src/main.h → src/Main.hxx

 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2012 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 MAIN_H
-#define MAIN_H
+#ifndef MPD_MAIN_HXX
+#define MPD_MAIN_HXX
 
 #include <glib.h>
 

src/OtherCommands.cxx

@@ -37,7 +37,7 @@ extern "C" {
 #include "permission.h"
 }
 
-#include "PlaylistFile.h"
+#include "PlaylistFile.hxx"
 
 extern "C" {
 #include "client.h"

src/PlaylistCommands.cxx

@@ -23,7 +23,7 @@
 #include "CommandError.hxx"
 #include "PlaylistPrint.hxx"
 #include "PlaylistSave.hxx"
-#include "PlaylistFile.h"
+#include "PlaylistFile.hxx"
 
 extern "C" {
 #include "protocol/argparser.h"

src/PlaylistFile.cxx

@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "PlaylistFile.h"
+#include "PlaylistFile.hxx"
 #include "PlaylistSave.hxx"
 #include "song.h"
 

src/PlaylistFile.h → src/PlaylistFile.hxx

@@ -17,14 +17,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPD_STORED_PLAYLIST_H
-#define MPD_STORED_PLAYLIST_H
+#ifndef MPD_PLAYLIST_FILE_HXX
+#define MPD_PLAYLIST_FILE_HXX
 
-#ifdef __cplusplus
 #include <list>
 #include <vector>
 #include <string>
-#endif
 
 #include <glib.h>
 #include <stdbool.h>
@@ -32,8 +30,6 @@
 
 struct song;
 
-#ifdef __cplusplus
-
 struct PlaylistFileInfo {
 	std::string name;
 
@@ -44,20 +40,14 @@ typedef std::list<PlaylistFileInfo> PlaylistFileList;
 
 typedef std::vector<std::string> PlaylistFileContents;
 
-#endif
-
 extern bool playlist_saveAbsolutePaths;
 
-G_BEGIN_DECLS
-
 /**
  * Perform some global initialization, e.g. load configuration values.
  */
 void
 spl_global_init(void);
 
-G_END_DECLS
-
 #ifdef __cplusplus
 
 /**

src/PlaylistMapper.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "PlaylistMapper.h"
-#include "PlaylistFile.h"
+#include "PlaylistFile.hxx"
 
 extern "C" {
 #include "playlist_list.h"

src/PlaylistPrint.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "PlaylistPrint.hxx"
-#include "PlaylistFile.h"
+#include "PlaylistFile.hxx"
 #include "QueuePrint.hxx"
 
 extern "C" {

src/PlaylistSave.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "PlaylistSave.hxx"
-#include "PlaylistFile.h"
+#include "PlaylistFile.hxx"
 #include "song.h"
 
 extern "C" {

src/main_win32.c → src/Win32Main.cxx

@@ -18,12 +18,15 @@
  */
 
 #include "config.h"
-#include "main.h"
+#include "Main.hxx"
 
 #ifdef WIN32
 
 #include "mpd_error.h"
+
+extern "C" {
 #include "event_pipe.h"
+}
 
 #include <glib.h>
 

src/client_event.c

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "client_internal.h"
-#include "main.h"
+#include "Main.hxx"
 
 #include <assert.h>
 

src/listen.c

@@ -22,7 +22,7 @@
 #include "server_socket.h"
 #include "client.h"
 #include "conf.h"
-#include "main.h"
+#include "Main.hxx"
 
 #include <string.h>
 #include <assert.h>

src/player_control.c

@@ -26,7 +26,7 @@
 #include "song.h"
 #include "idle.h"
 #include "pcm_volume.h"
-#include "main.h"
+#include "Main.hxx"
 
 #include <assert.h>
 #include <stdio.h>

src/player_thread.c

@@ -32,7 +32,7 @@
 #include "pipe.h"
 #include "chunk.h"
 #include "idle.h"
-#include "main.h"
+#include "Main.hxx"
 #include "buffer.h"
 #include "mpd_error.h"
 

src/playlist_global.c

@@ -26,7 +26,7 @@
 #include "playlist.h"
 #include "playlist_state.h"
 #include "event_pipe.h"
-#include "main.h"
+#include "Main.hxx"
 
 struct playlist g_playlist;
 

src/sig_handlers.c

@@ -23,7 +23,7 @@
 #ifndef WIN32
 
 #include "log.h"
-#include "main.h"
+#include "Main.hxx"
 #include "event_pipe.h"
 #include "mpd_error.h"
 

src/update.c

@@ -30,7 +30,7 @@
 #include "update.h"
 #include "idle.h"
 #include "stats.h"
-#include "main.h"
+#include "Main.hxx"
 #include "mpd_error.h"
 
 #include <glib.h>

src/update_remove.c

@@ -22,7 +22,7 @@
 #include "event_pipe.h"
 #include "song.h"
 #include "playlist.h"
-#include "main.h"
+#include "Main.hxx"
 
 #ifdef ENABLE_SQLITE
 #include "sticker.h"