diff options
| author | Martin Braun <martin.braun@ettus.com> | 2021-09-28 16:03:52 +0200 |
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2021-09-28 12:14:00 -0700 |
| commit | 44eb7a473b492e0dd855fa4de5381ba8526f69f8 (patch) | |
| tree | fb80757174b6fd5b38c0c83f8d8d4f9c0722bbed /tools | |
| parent | b34e2f05938a0af11d7c49510512490fc41e1af4 (diff) | |
| download | uhd-44eb7a473b492e0dd855fa4de5381ba8526f69f8.tar.gz uhd-44eb7a473b492e0dd855fa4de5381ba8526f69f8.tar.bz2 uhd-44eb7a473b492e0dd855fa4de5381ba8526f69f8.zip | |
dissectors: Fix inclusion of glib.h and Python version
Previously, we were doing this:
```cpp
extern "C" {
}
```
This is not how glib.h is supposed to be included, according to their
documentation. It turns out that it happened to work for a long time,
and lots of projects include glib.h that way, and the glib devs are
trying to accommodate for those cases. How nice of them!
However, on Fedora 34, we have a version of glib which does not have
a workaround patch, so we include glib.h the it should be.
The second issue was that a build script required the existence of
a `python` executable, which is not always available. A `python3`
executable can be assumed, since that's a dependency for UHD, too.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dissectors/epan/rfnoc/packet-rfnoc.cpp | 2 | ||||
| -rw-r--r-- | tools/dissectors/epan/zpu/packet-zpu.c | 2 | ||||
| -rwxr-xr-x | tools/dissectors/make-plugin-reg.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/dissectors/epan/rfnoc/packet-rfnoc.cpp b/tools/dissectors/epan/rfnoc/packet-rfnoc.cpp index 05e08b796..a0e699764 100644 --- a/tools/dissectors/epan/rfnoc/packet-rfnoc.cpp +++ b/tools/dissectors/epan/rfnoc/packet-rfnoc.cpp @@ -6,6 +6,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ +#include <glib.h> #ifdef __cplusplus extern "C" { #endif @@ -14,7 +15,6 @@ extern "C" { # include "config.h" #endif -#include <glib.h> #include <epan/packet.h> #ifdef __cplusplus diff --git a/tools/dissectors/epan/zpu/packet-zpu.c b/tools/dissectors/epan/zpu/packet-zpu.c index 3eff36997..dcbc1923c 100644 --- a/tools/dissectors/epan/zpu/packet-zpu.c +++ b/tools/dissectors/epan/zpu/packet-zpu.c @@ -18,6 +18,7 @@ * uint32_t data; */ +#include <glib.h> #ifdef __cplusplus extern "C" { #endif @@ -26,7 +27,6 @@ extern "C" { #include "config.h" #endif -#include <glib.h> #include <epan/packet.h> #ifdef __cplusplus diff --git a/tools/dissectors/make-plugin-reg.py b/tools/dissectors/make-plugin-reg.py index 6c394da97..14a0df804 100755 --- a/tools/dissectors/make-plugin-reg.py +++ b/tools/dissectors/make-plugin-reg.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Looks for registration routines in the plugins # and assembles C code to call all the routines. |