Skip to content

Commit ea0c113

Browse files
committed
fixed merging errors
1 parent b1b202c commit ea0c113

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

program/rust/src/c_oracle_header.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ unsafe impl Zeroable for pc_ema {
7575

7676
#[cfg(target_endian = "little")]
7777
unsafe impl Pod for pc_ema {
78+
}
7879

7980
unsafe impl Zeroable for cmd_add_price_t {
8081
}
@@ -89,5 +90,4 @@ unsafe impl Zeroable for pc_pub_key_t {
8990

9091
#[cfg(target_endian = "little")]
9192
unsafe impl Pod for pc_pub_key_t {
92-
9393
}

program/rust/src/rust_oracle.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use crate::deserialize::{
1111
load_account_as_mut,
1212
};
1313

14+
use bytemuck::bytes_of;
1415

1516
use solana_program::account_info::AccountInfo;
1617
use solana_program::entrypoint::SUCCESS;

0 commit comments

Comments
 (0)