Skip to content
Permalink
Browse files

native_posix: fix hw_irq_ctrl_get_irq_status() conflicting type

My compiler is rather fussy:

zephyr/boards/posix/native_posix/irq_ctrl.c:133:7:
error: conflicting types for ‘hw_irq_ctrl_get_irq_status’
 u64_t hw_irq_ctrl_get_irq_status(void)
       ^~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from zephyr/boards/posix/native_posix/irq_ctrl.c:11:
zephyr/boards/posix/native_posix/irq_ctrl.h:29:10:
note: previous declaration of ‘hw_irq_ctrl_get_irq_status’ was here
 uint64_t hw_irq_ctrl_get_irq_status(void);
          ^~~~~~~~~~~~~~~~~~~~~~~~~~

Make the definition match its declaration.

Signed-off-by: Nicolas Pitre <npitre@baylibre.com>
  • Loading branch information...
Nicolas Pitre authored and andrewboie committed May 24, 2019
1 parent 474c99c commit 74db5ce203b863df4c90774584be75d8e55b2d76
Showing with 2 additions and 1 deletion.
  1. +2 −1 boards/posix/native_posix/irq_ctrl.c
@@ -6,6 +6,7 @@
* HW IRQ controller model
*/

#include <stdint.h>
#include <stdbool.h>
#include "hw_models_top.h"
#include "irq_ctrl.h"
@@ -130,7 +131,7 @@ u32_t hw_irq_ctrl_change_lock(u32_t new_lock)
return previous_lock;
}

u64_t hw_irq_ctrl_get_irq_status(void)
uint64_t hw_irq_ctrl_get_irq_status(void)
{
return irq_status;
}

0 comments on commit 74db5ce

Please sign in to comment.
You can’t perform that action at this time.