moved all copies of strdupa macro to strdupa.h

6 files changed, 23 insertions, 39 deletions

diff --git a/plugins/converter/converter.c b/plugins/converter/converter.c
index d0f4b2eb..e26e7e6b 100644
--- a/plugins/converter/converter.c
+++ b/plugins/converter/converter.c
@@ -34,16 +34,7 @@
 #include <unistd.h>
 #include "converter.h"
 #include "../../deadbeef.h"
-
-#ifndef strdupa
-# define strdupa(s)							      \
-    ({									      \
-      const char *old = (s);					      \
-      size_t len = strlen (old) + 1;				      \
-      char *new = (char *) alloca (len);			      \
-      (char *) memcpy (new, old, len);				      \
-    })
-#endif
+#include "../../strdupa.h"
 
 #ifndef __linux__
 #define O_LARGEFILE 0
diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c
index 160f2d33..41d75d53 100644
--- a/plugins/ffmpeg/ffmpeg.c
+++ b/plugins/ffmpeg/ffmpeg.c
@@ -24,6 +24,7 @@
 #include <errno.h>
 
 #include "../../deadbeef.h"
+#include "../../strdupa.h"
 
 #if !FFMPEG_OLD
 
diff --git a/plugins/gtkui/hotkeys.c b/plugins/gtkui/hotkeys.c
index 4b7ac034..a34fb629 100644
--- a/plugins/gtkui/hotkeys.c
+++ b/plugins/gtkui/hotkeys.c
@@ -61,16 +61,7 @@ typedef struct
 #include <X11/Xlib.h> // only for the KeySym type
 #endif
 #include "hotkeys.h"
-
-#ifndef strdupa
-# define strdupa(s)							      \
-    ({									      \
-      const char *old = (s);					      \
-      size_t len = strlen (old) + 1;				      \
-      char *new = (char *) alloca (len);			      \
-      (char *) memcpy (new, old, len);				      \
-    })
-#endif
+#include "../../strdupa.h"
 
 void
 on_hotkeys_actions_cursor_changed      (GtkTreeView     *treeview,
diff --git a/plugins/gtkui/widgets.c b/plugins/gtkui/widgets.c
index 7318d894..e15fa0a4 100644
--- a/plugins/gtkui/widgets.c
+++ b/plugins/gtkui/widgets.c
@@ -37,19 +37,11 @@
 #endif
 #include "namedicons.h"
 #include "hotkeys.h" // for building action treeview
+#include "../../strdupa.h"
 
 #define min(x,y) ((x)<(y)?(x):(y))
 #define max(x,y) ((x)>(y)?(x):(y))
 
-#ifndef strdupa
-# define strdupa(s)							      \
-    ({									      \
-      const char *old = (s);					      \
-      size_t len = strlen (old) + 1;				      \
-      char *new = (char *) alloca (len);			      \
-      (char *) memcpy (new, old, len);				      \
-    })
-#endif
 
 // utility code for parsing keyvalues
 #define get_keyvalue(s,key,val) {\
diff --git a/strdupa.h b/strdupa.h
new file mode 100644
index 00000000..00a94cb6
--- /dev/null
+++ b/strdupa.h
@@ -0,0 +1,18 @@
+#ifndef __DDB_PLATFORM_H
+#define __DDB_PLATFORM_H
+
+#include <string.h>
+
+#ifndef _GNU_SOURCE
+#ifndef strdupa
+# define strdupa(s)							      \
+    ({									      \
+      const char *old = (s);					      \
+      size_t len = strlen (old) + 1;				      \
+      char *new = (char *) alloca (len);			      \
+      (char *) memcpy (new, old, len);				      \
+    })
+#endif
+#endif
+
+#endif
diff --git a/streamer.c b/streamer.c
index 58e97172..54960e40 100644
--- a/streamer.c
+++ b/streamer.c
@@ -50,6 +50,7 @@
 #include "fft.h"
 #include "handler.h"
 #include "plugins/libparser/parser.h"
+#include "strdupa.h"
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(fmt,...)
@@ -57,16 +58,6 @@
 //#define WRITE_DUMP 1
 //#define DETECT_PL_LOCK_RC 1
 
-#ifndef strdupa
-# define strdupa(s)							      \
-    ({									      \
-      const char *old = (s);					      \
-      size_t len = strlen (old) + 1;				      \
-      char *new = (char *) alloca (len);			      \
-      (char *) memcpy (new, old, len);				      \
-    })
-#endif
-
 #if WRITE_DUMP
 FILE *out;
 #endif