[Linuxptp-devel] [PATCH] missing: the previous patch was incorrect

[Jacob Keller]

After finding the mistake in a previous patch, I did a bit more digging and
realized this patch was broken too. This fixes the typo missing semicolon and
also fixes the grep location

Signed-off-by: Jacob Keller <***@intel.com>
---
makefile | 2 +-
missing.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/makefile b/makefile
index d79a1df..6172c3e 100644
--- a/makefile
+++ b/makefile
@@ -21,7 +21,7 @@ FEAT_CFLAGS :=
ifneq ($(shell grep --no-messages clock_adjtime /usr/include/bits/time.h),)
FEAT_CFLAGS += -D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME
endif
-ifneq ($(shell grep --no-messages HWTSTAMP_TX_ONESTEP_SYNC $(KBUILD_OUTPUT)/usr/include/linux/net_tstamp.h),)
+ifneq ($(shell grep --no-messages HWTSTAMP_TX_ONESTEP_SYNC $(KBUILD_OUTPUT)include/uapi/linux/net_tstamp.h),)
FEAT_CFLAGS += -DHAVE_ONESTEP_SYNC
endif

diff --git a/missing.h b/missing.h
index 99a8d83..d6b2355 100644
--- a/missing.h
+++ b/missing.h
@@ -47,7 +47,7 @@
#ifndef HAVE_ONESTEP_SYNC
enum _missing_hwtstamp_tx_types {
HWTSTAMP_TX_ONESTEP_SYNC = 2,
-}
+};
#endif

#ifndef HAVE_CLOCK_ADJTIME

[Keller, Jacob E]

Ignore this, a v2 on its way forgot a / between kbuild_output and the
include

Thanks,
Jake

Post by Jacob Keller
After finding the mistake in a previous patch, I did a bit more digging and
realized this patch was broken too. This fixes the typo missing semicolon and
also fixes the grep location
---
makefile | 2 +-
missing.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/makefile b/makefile
index d79a1df..6172c3e 100644
--- a/makefile
+++ b/makefile
@@ -21,7 +21,7 @@ FEAT_CFLAGS :=
ifneq ($(shell grep --no-messages clock_adjtime /usr/include/bits/time.h),)
FEAT_CFLAGS += -D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME
endif
-ifneq ($(shell grep --no-messages HWTSTAMP_TX_ONESTEP_SYNC $(KBUILD_OUTPUT)/usr/include/linux/net_tstamp.h),)
+ifneq ($(shell grep --no-messages HWTSTAMP_TX_ONESTEP_SYNC $(KBUILD_OUTPUT)include/uapi/linux/net_tstamp.h),)
FEAT_CFLAGS += -DHAVE_ONESTEP_SYNC
endif
diff --git a/missing.h b/missing.h
index 99a8d83..d6b2355 100644
--- a/missing.h
+++ b/missing.h
@@ -47,7 +47,7 @@
#ifndef HAVE_ONESTEP_SYNC
enum _missing_hwtstamp_tx_types {
HWTSTAMP_TX_ONESTEP_SYNC = 2,
-}
+};
#endif
#ifndef HAVE_CLOCK_ADJTIME
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk
_______________________________________________
Linuxptp-devel mailing list
https://lists.sourceforge.net/