xsvf: Fix shadow issues on Mac

[openocd] / src / pld / pld.h

diff --git a/src/pld/pld.h b/src/pld/pld.h
index 4c4c64a77649fc02884adbfbb6827b2c2d8e8334..d306246b704451883e99de034e1d79c8affe8354 100644 (file)
--- a/src/pld/pld.h
+++ b/src/pld/pld.h
@@ -20,7 +20,7 @@
 #ifndef PLD_H
 #define PLD_H
 
-#include "command.h"
+#include <helper/command.h>
 
 struct pld_device;
 
@@ -31,7 +31,7 @@ struct pld_driver
 {
        char *name;
        __PLD_DEVICE_COMMAND((*pld_device_command));
-       int (*register_commands)(struct command_context_s *cmd_ctx);
+       const struct command_registration *commands;
        int (*load)(struct pld_device *pld_device, const char *filename);
 };
 
@@ -44,9 +44,7 @@ struct pld_device
        struct pld_device *next;
 };
 
-int pld_register_commands(struct command_context_s *cmd_ctx);
-
-int pld_init(struct command_context_s *cmd_ctx);
+int pld_register_commands(struct command_context *cmd_ctx);
 
 struct pld_device *get_pld_device_by_num(int num);