Merge remote-tracking branch 'github/master'

[stg.git] / include / stg / rs_packets.h

diff --git a/include/stg/rs_packets.h b/include/stg/rs_packets.h
index 503fe91d7584522d9280c760eabc9f55eda7fa3f..6faea5259a669ec49d37531c65005b58d7ff84c8 100644 (file)
--- a/include/stg/rs_packets.h
+++ b/include/stg/rs_packets.h
@@ -19,8 +19,7 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-#ifndef RS_PACKETSH
-#define RS_PACKETSH
+#pragma once

 
 #define RS_MAGIC_LEN        (6)
 #define RS_PROTO_VER_LEN    (2)
 
 #define RS_MAGIC_LEN        (6)
 #define RS_PROTO_VER_LEN    (2)


@@ -34,9 +33,9 @@
 
 #define RS_ID "RSP00"
 
 
 #define RS_ID "RSP00"
 

-#include "os_int.h"
+#include <cstdint>

 
 

-namespace RS
+namespace STG::RS

 {
 
 struct PACKET_HEADER
 {
 
 struct PACKET_HEADER


@@ -58,5 +57,3 @@ int8_t              padding[7];
 } __attribute__((__packed__)); // 992 bytes, 124 blocks
 
 } // namespace RS
 } __attribute__((__packed__)); // 992 bytes, 124 blocks
 
 } // namespace RS

-
-#endif