Commit e8789d7c authored by Max Kellermann's avatar Max Kellermann

system/FatalError: remove GError support

parent 0053cd0d
...@@ -55,7 +55,6 @@ src_mpd_LDADD = \ ...@@ -55,7 +55,6 @@ src_mpd_LDADD = \
mpd_headers = \ mpd_headers = \
src/check.h \ src/check.h \
src/gerror.h \
src/AudioCompress/config.h \ src/AudioCompress/config.h \
src/AudioCompress/compress.h \ src/AudioCompress/compress.h \
src/open.h \ src/open.h \
......
/*
* 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
...@@ -78,16 +78,6 @@ FatalError(const char *msg, const Error &error) ...@@ -78,16 +78,6 @@ FatalError(const char *msg, const Error &error)
FormatFatalError("%s: %s", msg, error.GetMessage()); FormatFatalError("%s: %s", msg, error.GetMessage());
} }
#ifdef HAVE_GLIB
void
FatalError(const char *msg, GError *error)
{
FormatFatalError("%s: %s", msg, error->message);
}
#endif
void void
FatalSystemError(const char *msg) FatalSystemError(const char *msg)
{ {
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#define MPD_FATAL_ERROR_HXX #define MPD_FATAL_ERROR_HXX
#include "check.h" #include "check.h"
#include "gerror.h"
#include "Compiler.h" #include "Compiler.h"
class Error; class Error;
...@@ -45,12 +44,6 @@ gcc_noreturn ...@@ -45,12 +44,6 @@ gcc_noreturn
void void
FatalError(const char *msg, const Error &error); 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 * Call this after a system call has failed that is not supposed to
* fail. Prints the given message, the system error message (from * fail. Prints the given message, the system error message (from
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment