Commit 7168c62
committed
bootutil: Avoid re-definition of MCUBOOT_SWAP_USING_SCRATCH
Two identical definitions of MCUBOOT_SWAP_USING_SCRATCH occur in
bootutil_priv.h and bootutil_area.c. This commit removes the duplicate in
bootutil_area.c.
Signed-off-by: kkrentz <konrad.krentz@gmail.com>1 parent afcca2c commit 7168c62
1 file changed
+2
-10
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| 8 | + | |
8 | 9 | | |
9 | 10 | | |
10 | 11 | | |
| |||
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
| 31 | + | |
30 | 32 | | |
31 | 33 | | |
32 | 34 | | |
| |||
36 | 38 | | |
37 | 39 | | |
38 | 40 | | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | 41 | | |
50 | 42 | | |
51 | 43 | | |
| |||
0 commit comments