hero123457/uhd
1
0
Fork 0
mirror of https://github.com/EttusResearch/uhd.git synced 2026-10-25 17:36:10 +00:00
Code Issues Projects Releases Wiki Activity

dissectors: Fix inclusion of glib.h and Python version

Browse Source 
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.
This commit is contained in:
Martin Braun 2021-09-28 16:03:52 +02:00 committed by Aaron Rossetto
parent b34e2f0593
commit 44eb7a473b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/dissectors/epan/rfnoc/packet-rfnoc.cpp
View File

@ -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

2
tools/dissectors/epan/zpu/packet-zpu.c
View File

@ -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

2
tools/dissectors/make-plugin-reg.py
View File

@ -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.