bitops.h should not be included from public pci.h

diff --git a/ChangeLog b/ChangeLog
index 5243febff4610508cec7bf4bcbaec7f5023b17bb..39df71344f60e47f6de56d3d97d0c36f19edc9ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-02-17  Martin Mares <mj@ucw.cz>
+
+       * Will be released as 3.11.0.
+
+       * All source files now have SPDX license identifiers.
+
 2023-05-01  Martin Mares <mj@ucw.cz>
 
        * Released as 3.10.0.

diff --git a/lib/pci.h b/lib/pci.h
index d309cbba6bc3c87f317b8da3cb62dee09ec108ea..03b4c41694ff03d4302f6564336d4e6757f43162 100644 (file)
--- a/lib/pci.h
+++ b/lib/pci.h
@@ -17,7 +17,6 @@
 
 #include "header.h"
 #include "types.h"
-#include "bitops.h"
 
 #define PCI_LIB_VERSION 0x030a00
 

diff --git a/lmr/lmr.h b/lmr/lmr.h
index 7375c33f6358a7b676c4c00daee000309aa0fc78..f728fca78d1e8ab9d0ea8d00ccf103a1a67d7e8a 100644 (file)
--- a/lmr/lmr.h
+++ b/lmr/lmr.h
@@ -14,6 +14,7 @@
 #include <stdbool.h>
 
 #include "pciutils.h"
+#include "lib/bitops.h"
 
 #define MARGIN_STEP_MS 1000
 

diff --git a/pciutils.h b/pciutils.h
index 95c26e64f3d00e19c8b5424e65f3fd4112c3a290..9e8508900fcdc8829bbd580144636708a4808791 100644 (file)
--- a/pciutils.h
+++ b/pciutils.h
@@ -10,6 +10,7 @@
 
 #include "lib/pci.h"
 #include "lib/sysdep.h"
+#include "lib/bitops.h"
 
 /*
  * gcc predefines macro __MINGW32__ for all MinGW targets.