sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #330 from marckleinebudde/fix-types 

testj1939: fix 64-bit types for some platforms
pull/331/head
Marc Kleine-Budde 2022-01-03 10:47:39 +01:00 committed by GitHub
parent fd1d61490c e370ad5256
commit 9e5b6266b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libj1939.h
View File

@ -10,6 +10,9 @@
* as published by the Free Software Foundation * as published by the Free Software Foundation
*/ */
/* needed on some 644 bit platforms to get consistent 64-bit types */
#define __SANE_USERSPACE_TYPES__
#include <sys/socket.h> #include <sys/socket.h>
#include <linux/can.h> #include <linux/can.h>
#include <linux/can/j1939.h> #include <linux/can/j1939.h>

2
testj1939.c
View File

@ -295,7 +295,7 @@ int main(int argc, char *argv[])
int i; int i;
if (todo_names && peername.can_addr.j1939.name) if (todo_names && peername.can_addr.j1939.name)
printf("%016" PRIx64 " ", peername.can_addr.j1939.name); printf("%016llx ", peername.can_addr.j1939.name);
printf("%02x %05x:", peername.can_addr.j1939.addr, printf("%02x %05x:", peername.can_addr.j1939.addr,
peername.can_addr.j1939.pgn); peername.can_addr.j1939.pgn);
for (i = 0, j = 0; i < ret; ++i, j++) { for (i = 0, j = 0; i < ret; ++i, j++) {