Project-wide consistent naming for #include guards.

Document the naming scheme in HACKING.

diff --git a/hardware/asix-sigma/asix-sigma.h b/hardware/asix-sigma/asix-sigma.h
index 9e35805a618bcb9eabf78518a12d5c9d4c9e50bc..fbecb80f9008ec0a2b7cc6912c15a7a3f359f099 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.h
+++ b/hardware/asix-sigma/asix-sigma.h
@@ -19,8 +19,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGROK_ASIX_SIGMA_H
-#define SIGROK_ASIX_SIGMA_H
+#ifndef LIBSIGROK_HARDWARE_ASIX_SIGMA_ASIX_SIGMA_H
+#define LIBSIGROK_HARDWARE_ASIX_SIGMA_ASIX_SIGMA_H
 
 enum sigma_write_register {
        WRITE_CLOCK_SELECT      = 0,

diff --git a/hardware/link-mso19/link-mso19.h b/hardware/link-mso19/link-mso19.h
index 47a9af28be33ddbe4c575cc9085f32f0d25b6cee..02a42e5290d0f44dff150c51e0b93bd63ff93888 100644 (file)
--- a/hardware/link-mso19/link-mso19.h
+++ b/hardware/link-mso19/link-mso19.h
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGROK_LINK_MSO19_H
-#define SIGROK_LINK_MSO19_H
+#ifndef LIBSIGROK_HARDWARE_LINK_MSO19_LINK_MSO19_H
+#define LIBSIGROK_HARDWARE_LINK_MSO19_LINK_MSO19_H
 
 /* Structure for the pattern generator state */
 struct mso_patgen {

diff --git a/hardware/openbench-logic-sniffer/ols.h b/hardware/openbench-logic-sniffer/ols.h
index a554ae8c0b42239a1f26e71436fae017293cd31d..0b1a61361c0297618381eb25ab1333073a249f91 100644 (file)
--- a/hardware/openbench-logic-sniffer/ols.h
+++ b/hardware/openbench-logic-sniffer/ols.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef OLS_H_
-#define OLS_H_
+#ifndef LIBSIGROK_HARDWARE_OPENBENCH_LOGIC_SNIFFER_OLS_H
+#define LIBSIGROK_HARDWARE_OPENBENCH_LOGIC_SNIFFER_OLS_H
 
 #define NUM_PROBES             32
 #define NUM_TRIGGER_STAGES     4
@@ -91,4 +91,4 @@ struct ols_device {
        struct sr_serial_device_instance *serial;
 };
 
-#endif /* OLS_H_ */
+#endif

diff --git a/hardware/saleae-logic/saleae-logic.h b/hardware/saleae-logic/saleae-logic.h
index d07d033af71c1b00ebde70ee408d79d4cf7464a3..bb870019aece743dd262a2214a04c418acbf4a8b 100644 (file)
--- a/hardware/saleae-logic/saleae-logic.h
+++ b/hardware/saleae-logic/saleae-logic.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SALEAE_LOGIC_H_
-#define SALEAE_LOGIC_H_
+#ifndef LIBSIGROK_HARDWARE_SALEAE_LOGIC_SALEAE_LOGIC_H
+#define LIBSIGROK_HARDWARE_SALEAE_LOGIC_SALEAE_LOGIC_H
 
 #define USB_INTERFACE          0
 #define USB_CONFIGURATION      1
@@ -74,4 +74,4 @@ struct fx2_device {
        struct sr_usb_device_instance *usb;
 };
 
-#endif /* SALEAE_LOGIC_H_ */
+#endif

diff --git a/hardware/zeroplus-logic-cube/analyzer.h b/hardware/zeroplus-logic-cube/analyzer.h
index 9416478479b4316f1e5c9463ae35dc68cec99245..27722af72a7af4a23f0d54129a5be6c1c9496efd 100644 (file)
--- a/hardware/zeroplus-logic-cube/analyzer.h
+++ b/hardware/zeroplus-logic-cube/analyzer.h
@@ -29,8 +29,8 @@
  *  THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SIGROK_ZEROPLUS_ANALYZER_H
-#define SIGROK_ZEROPLUS_ANALYZER_H
+#ifndef LIBSIGROK_HARDWARE_ZEROPLUS_LOGIC_CUBE_ANALYZER_H
+#define LIBSIGROK_HARDWARE_ZEROPLUS_LOGIC_CUBE_ANALYZER_H
 
 #include <libusb.h>
 #include "sigrok.h"

diff --git a/hardware/zeroplus-logic-cube/gl_usb.h b/hardware/zeroplus-logic-cube/gl_usb.h
index a5ae01131b1f634895a9eb79b1ff1bd0a8e8ebb3..04a5163d4d9ce66777e96ab7290f1a6a7917c471 100644 (file)
--- a/hardware/zeroplus-logic-cube/gl_usb.h
+++ b/hardware/zeroplus-logic-cube/gl_usb.h
@@ -29,8 +29,8 @@
  *  THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SIGROK_ZEROPLUS_GL_H
-#define SIGROK_ZEROPLUS_GL_H
+#ifndef LIBSIGROK_HARDWARE_ZEROPLUS_LOGIC_CUBE_GL_USB_H
+#define LIBSIGROK_HARDWARE_ZEROPLUS_LOGIC_CUBE_GL_USB_H
 
 #include <libusb.h>
 #include "sigrok.h"

diff --git a/output/text/text.h b/output/text/text.h
index c166d853117d566a685800105f787677cb27ba9c..9d5abd530c509b1bdc70167909a3a8a255c849a9 100644 (file)
--- a/output/text/text.h
+++ b/output/text/text.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TEXT_H_
-#define TEXT_H_
+#ifndef LIBSIGROK_OUTPUT_TEXT_TEXT_H
+#define LIBSIGROK_OUTPUT_TEXT_TEXT_H
 
 #define DEFAULT_BPL_BITS 64
 #define DEFAULT_BPL_HEX  192

diff --git a/sigrok-internal.h b/sigrok-internal.h
index b5aea17b6a46dc63ea797ae6c873d185b77ecf8a..63b45a309dc654b25cc4c8454fd028b2092a1845 100644 (file)
--- a/sigrok-internal.h
+++ b/sigrok-internal.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGROK_SIGROK_INTERNAL_H
-#define SIGROK_SIGROK_INTERNAL_H
+#ifndef LIBSIGROK_SIGROK_INTERNAL_H
+#define LIBSIGROK_SIGROK_INTERNAL_H
 
 #include <stdarg.h>
 #include <glib.h>

diff --git a/sigrok-proto.h b/sigrok-proto.h
index 5b883043febac8c85f0a203fb38b0b115979ad85..3e91a3fa0a4d2fa39363bbdc2e34135ddfd2609a 100644 (file)
--- a/sigrok-proto.h
+++ b/sigrok-proto.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGROK_SIGROK_PROTO_H
-#define SIGROK_SIGROK_PROTO_H
+#ifndef LIBSIGROK_SIGROK_PROTO_H
+#define LIBSIGROK_SIGROK_PROTO_H
 
 /*--- backend.c -------------------------------------------------------------*/
 

diff --git a/sigrok.h.in b/sigrok.h.in
index 0a18f8d1231b09c3465e1bef8c70a11506af0912..a767dc71bceb980746a46ec412309076096a38da 100644 (file)
--- a/sigrok.h.in
+++ b/sigrok.h.in
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGROK_SIGROK_H
-#define SIGROK_SIGROK_H
+#ifndef LIBSIGROK_SIGROK_H
+#define LIBSIGROK_SIGROK_H
 
 #include <stdio.h>
 #include <sys/time.h>