diff mbox

[v2,2/2] dhcpdump: Fix strsep() feature test

Message ID 1407240749-17574-2-git-send-email-benoit.thebaudeau@advansee.com
State Accepted
Headers show

Commit Message

Benoît Thébaudeau Aug. 5, 2014, 12:12 p.m. UTC
Use the official _BSD_SOURCE feature test macro instead of the meaningless
HAVE_STRSEP macro in order to detect the availability of strsep().

This allows toolchains supporting strsep() to use it instead of the custom
implementation from dhcpdump, which also avoids the following error with some
toolchains:

	In file included from dhcpdump.c:30:0:
	dhcpdump.c: At top level:
	strsep.c:65:23: error: register name not specified for ‘delim’
	  register const char *delim;
	                       ^

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>

---

Changes in v2:
 - Fix patch file name according to patch naming convention.
 - Add description and Sob line to patch.
---
 .../dhcpdump-0002-fix-strsep-feature-test.patch    | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 package/dhcpdump/dhcpdump-0002-fix-strsep-feature-test.patch
diff mbox

Patch

diff --git a/package/dhcpdump/dhcpdump-0002-fix-strsep-feature-test.patch b/package/dhcpdump/dhcpdump-0002-fix-strsep-feature-test.patch
new file mode 100644
index 0000000..06bab94
--- /dev/null
+++ b/package/dhcpdump/dhcpdump-0002-fix-strsep-feature-test.patch
@@ -0,0 +1,27 @@ 
+Use the official _BSD_SOURCE feature test macro instead of the meaningless
+HAVE_STRSEP macro in order to detect the availability of strsep().
+
+This allows toolchains supporting strsep() to use it instead of the custom
+implementation from dhcpdump, which also avoids the following error with some
+toolchains:
+
+	In file included from dhcpdump.c:30:0:
+	dhcpdump.c: At top level:
+	strsep.c:65:23: error: register name not specified for ‘delim’
+	  register const char *delim;
+	                       ^
+
+Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
+
+diff -Nrdup dhcpdump-1.8.orig/dhcpdump.c dhcpdump-1.8/dhcpdump.c
+--- dhcpdump-1.8.orig/dhcpdump.c	2008-06-24 05:26:52.000000000 +0200
++++ dhcpdump-1.8/dhcpdump.c	2011-05-31 19:22:15.987388498 +0200
+@@ -26,7 +26,7 @@
+ #include <regex.h>
+ #include "dhcp_options.h"
+ 
+-#ifndef HAVE_STRSEP
++#ifndef _BSD_SOURCE
+ #include "strsep.c"
+ #endif
+