diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | src/gerror.h | 25 | ||||
| -rw-r--r-- | src/system/FatalError.cxx | 10 | ||||
| -rw-r--r-- | src/system/FatalError.hxx | 7 |
4 files changed, 0 insertions, 43 deletions
diff --git a/Makefile.am b/Makefile.am index 2decacbd8..ad9127cda 100644 --- a/Makefile.am +++ b/Makefile.am @@ -55,7 +55,6 @@ src_mpd_LDADD = \ mpd_headers = \ src/check.h \ - src/gerror.h \ src/AudioCompress/config.h \ src/AudioCompress/compress.h \ src/open.h \ diff --git a/src/gerror.h b/src/gerror.h deleted file mode 100644 index 797ad90a2..000000000 --- a/src/gerror.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2003-2014 The Music Player Daemon Project - * http://www.musicpd.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef MPD_GERROR_H -#define MPD_GERROR_H - -typedef struct _GError GError; - -#endif diff --git a/src/system/FatalError.cxx b/src/system/FatalError.cxx index cae6600dc..35e94f169 100644 --- a/src/system/FatalError.cxx +++ b/src/system/FatalError.cxx @@ -78,16 +78,6 @@ FatalError(const char *msg, const Error &error) FormatFatalError("%s: %s", msg, error.GetMessage()); } -#ifdef HAVE_GLIB - -void -FatalError(const char *msg, GError *error) -{ - FormatFatalError("%s: %s", msg, error->message); -} - -#endif - void FatalSystemError(const char *msg) { diff --git a/src/system/FatalError.hxx b/src/system/FatalError.hxx index 8d5f73aa2..d4698b3d9 100644 --- a/src/system/FatalError.hxx +++ b/src/system/FatalError.hxx @@ -21,7 +21,6 @@ #define MPD_FATAL_ERROR_HXX #include "check.h" -#include "gerror.h" #include "Compiler.h" class Error; @@ -45,12 +44,6 @@ gcc_noreturn void FatalError(const char *msg, const Error &error); -#ifdef HAVE_GLIB -gcc_noreturn -void -FatalError(const char *msg, GError *error); -#endif - /** * Call this after a system call has failed that is not supposed to * fail. Prints the given message, the system error message (from |