From: Abramo Bagnara <abramo@alsa-project.org>
Date: Mon, 1 Jan 2001 15:15:41 +0000 (+0000)
Subject: Moved ERR and SYSERR to a global place
X-Git-Tag: v1.0.3~1032
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=77d992bebc43a96f9af723285e385795e3957b1e;p=alsa-lib.git

Moved ERR and SYSERR to a global place
---

diff --git a/include/Makefile.am b/include/Makefile.am
index 324059c5..06315574 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -7,7 +7,7 @@ header_files=header.h version.h global.h error.h control.h mixer.h pcm.h \
              rawmidi.h timer.h hwdep.h seq.h seqmid.h seq_midi_event.h \
              conv.h instr.h conf.h footer.h
 
-noinst_HEADERS=$(header_files) search.h list.h aserver.h
+noinst_HEADERS=$(header_files) search.h list.h aserver.h local.h
 
 asoundlib.h: $(header_files)
 	cat $^ > $@
diff --git a/include/local.h b/include/local.h
new file mode 100644
index 00000000..0c890047
--- /dev/null
+++ b/include/local.h
@@ -0,0 +1,29 @@
+/*
+ *  ALSA lib - local header file
+ *  Copyright (c) 2000 by Abramo Bagnara <abramo@alsa-project.org>
+ *
+ *
+ *   This library is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU Library 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 Library General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Library General Public
+ *   License along with this library; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
+#define ERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, __VA_ARGS__)
+#define SYSERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, __VA_ARGS__)
+#else
+#define ERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, ##args)
+#define SYSERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, ##args)
+#endif
+
diff --git a/src/control/control_local.h b/src/control/control_local.h
index 5bd9f197..9a571dec 100644
--- a/src/control/control_local.h
+++ b/src/control/control_local.h
@@ -21,16 +21,9 @@
 
 #include <assert.h>
 #include "asoundlib.h"
+#include "local.h"
 #include "list.h"
 
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-#define ERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, __VA_ARGS__)
-#define SYSERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, __VA_ARGS__)
-#else
-#define ERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, ##args)
-#define SYSERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, ##args)
-#endif
-
 typedef struct {
 	int (*close)(snd_ctl_t *handle);
 	int (*card)(snd_ctl_t *handle);
diff --git a/src/pcm/pcm_local.h b/src/pcm/pcm_local.h
index 616554bf..7fba5fd3 100644
--- a/src/pcm/pcm_local.h
+++ b/src/pcm/pcm_local.h
@@ -27,14 +27,7 @@
 #include <sys/uio.h>
 #include <errno.h>
 #include "asoundlib.h"
-
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-#define ERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, __VA_ARGS__)
-#define SYSERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, __VA_ARGS__)
-#else
-#define ERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, ##args)
-#define SYSERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, ##args)
-#endif
+#include "local.h"
 
 typedef struct _snd_pcm_channel_info {
 	unsigned int channel;
diff --git a/src/rawmidi/rawmidi_local.h b/src/rawmidi/rawmidi_local.h
index 16f7c037..7fa88d33 100644
--- a/src/rawmidi/rawmidi_local.h
+++ b/src/rawmidi/rawmidi_local.h
@@ -25,14 +25,7 @@
 #include <limits.h>
 #include <errno.h>
 #include "asoundlib.h"
-
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-#define ERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, __VA_ARGS__)
-#define SYSERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, __VA_ARGS__)
-#else
-#define ERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, ##args)
-#define SYSERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, ##args)
-#endif
+#include "local.h"
 
 typedef struct {
 	int (*close)(snd_rawmidi_t *rawmidi);
diff --git a/src/seq/seq_local.h b/src/seq/seq_local.h
index 24b815c7..580be221 100644
--- a/src/seq/seq_local.h
+++ b/src/seq/seq_local.h
@@ -29,19 +29,12 @@
 #include <limits.h>
 #include <errno.h>
 #include "asoundlib.h"
+#include "local.h"
 
 #define SND_SEQ_OBUF_SIZE	(16*1024)	/* default size */
 #define SND_SEQ_IBUF_SIZE	500		/* in event_size aligned */
 #define DEFAULT_TMPBUF_SIZE	20
 
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-#define ERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, __VA_ARGS__)
-#define SYSERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, __VA_ARGS__)
-#else
-#define ERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, ##args)
-#define SYSERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, ##args)
-#endif
-
 typedef struct {
 	int (*close)(snd_seq_t *seq);
 	int (*nonblock)(snd_seq_t *seq, int nonblock);