diff options
| author | yangwei <[email protected]> | 2023-11-17 20:55:03 +0800 |
|---|---|---|
| committer | yangwei <[email protected]> | 2023-11-17 20:55:03 +0800 |
| commit | b5c0f0a9ec0051ccb2133534954912f79d00456d (patch) | |
| tree | 7f04a641944a0dfcf93fcc59d4ca10ce03053261 | |
| parent | ad4af8cd2797c07594afa6279f3417aa5d3443d6 (diff) | |
🐞 fix(Package.cmake): 删除冗余的CPack命令
| -rw-r--r-- | cmake/Package.cmake | 4 | ||||
| -rw-r--r-- | src/packet_io/packet_io_marsio.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/cmake/Package.cmake b/cmake/Package.cmake index 462b170..919fc9a 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -27,8 +27,6 @@ set(CPACK_RPM_PACKAGE_RELEASE_DIST "on") set(CPACK_RPM_DEBUGINFO_PACKAGE "on") set(CPACK_RPM_PACKAGE_VENDOR "MESA") -#set(CPACK_RPM_PACKAGE_RELEASE_LIBRARY "on") - set(CPACK_RPM_COMPONENT_INSTALL ON) set(CPACK_COMPONENTS_IGNORE_GROUPS 1) set(CPACK_COMPONENTS_GROUPING ONE_PER_GROUP) @@ -50,7 +48,6 @@ set(CPACK_RPM_HEADER_PACKAGE_CONFLICTS ${CPACK_RPM_HEADER_PACKAGE_NAME}) set(CPACK_COMPONENTS_ALL LIBRARY HEADER EXECUTABLE PROFILE) -set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}") set(CPACK_RPM_PACKAGE_AUTOREQPROV "no") set(CPACK_RPM_PACKAGE_AUTOREQ "no") @@ -81,3 +78,4 @@ set(CPACK_RPM_PACKAGE_CONFLICTS ${MY_RPM_NAME_PREFIX}) include(CPack) + diff --git a/src/packet_io/packet_io_marsio.c b/src/packet_io/packet_io_marsio.c index ae2adef..b7169c6 100644 --- a/src/packet_io/packet_io_marsio.c +++ b/src/packet_io/packet_io_marsio.c @@ -509,7 +509,7 @@ int marsio_send_ctrl_data(unsigned char *data,int datalen, struct segment_id_lis return -1;
}
memcpy(real_buf, data, datalen);
- int zero=0;
+ unsigned long long zero=0;
ptr_marsio_buff_set_ctrlbuf(send_mbuf[0]);
ptr_marsio_buff_set_metadata(send_mbuf[0], MR_BUFF_PAYLOAD_OFFSET, (void *)&(zero), sizeof(unsigned short));
ptr_marsio_buff_set_metadata(send_mbuf[0], MR_BUFF_SESSION_ID, (void *)&(zero), sizeof(unsigned long));
|