Moved ERR and SYSERR to a global place

diff --git a/include/Makefile.am b/include/Makefile.am
index 324059c58d18fe644fe6db75847dc01483fde657..06315574298a2f82e4fd16ee7ae80efce7633aa5 100644 (file)
--- 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 (file)
index 0000000..0c89004
--- /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 5bd9f197528f96dcc806e39cf2bbaa2e7336678b..9a571decb163433380af7f216d16010a5292f5dc 100644 (file)
--- 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 616554bf73a930627b06a2b7cbb8595cfda2a66c..7fba5fd3451d1243f8a11d026bbcf488ab0f93b8 100644 (file)
--- 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 16f7c0370861fd933a32e8fb4ddd56ce8c892d6f..7fa88d332298024c990c8adaefa23c3553b67a5b 100644 (file)
--- 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 24b815c750276de53585a3a8d1982692f523cfc7..580be221466d24601af3672ced36e4d8b0bb546a 100644 (file)
--- 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);