From 625aed204222818ea438b1be8dd2fe95fbc87926 Mon Sep 17 00:00:00 2001
From: lihui <lihui359@huawei.com>
Date: Tue, 12 Nov 2024 12:01:55 +0800
Subject: [PATCH] cherry pick 49ebf6a from
 https://gitee.com/li_hui180/interface_sdk_c/pulls/1709 api lint alarm fix

Signed-off-by: lihui <lihui359@huawei.com>
---
 graphic/graphic_2d/native_buffer/buffer_common.h      | 6 +++---
 graphic/graphic_2d/native_buffer/native_buffer.h      | 6 +++---
 graphic/graphic_2d/native_image/native_image.h        | 6 +++---
 graphic/graphic_2d/native_vsync/native_vsync.h        | 7 ++++---
 graphic/graphic_2d/native_window/buffer_handle.h      | 7 ++++---
 graphic/graphic_2d/native_window/external_window.h    | 6 +++---
 graphic/graphic_2d/native_window/graphic_error_code.h | 6 +++---
 7 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/graphic/graphic_2d/native_buffer/buffer_common.h b/graphic/graphic_2d/native_buffer/buffer_common.h
index d6764624096..20b22fd8733 100644
--- a/graphic/graphic_2d/native_buffer/buffer_common.h
+++ b/graphic/graphic_2d/native_buffer/buffer_common.h
@@ -13,9 +13,6 @@
  * limitations under the License.
  */
 
-#ifndef NDK_INCLUDE_BUFFER_COMMON_H_
-#define NDK_INCLUDE_BUFFER_COMMON_H_
-
 /**
  * @addtogroup OH_NativeBuffer
  * @{
@@ -39,6 +36,9 @@
  * @version 1.0
  */
 
+#ifndef NDK_INCLUDE_BUFFER_COMMON_H_
+#define NDK_INCLUDE_BUFFER_COMMON_H_
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/graphic/graphic_2d/native_buffer/native_buffer.h b/graphic/graphic_2d/native_buffer/native_buffer.h
index 154df76d3ea..2ca2fc617c5 100644
--- a/graphic/graphic_2d/native_buffer/native_buffer.h
+++ b/graphic/graphic_2d/native_buffer/native_buffer.h
@@ -13,9 +13,6 @@
  * limitations under the License.
  */
 
-#ifndef NDK_INCLUDE_NATIVE_BUFFER_H_
-#define NDK_INCLUDE_NATIVE_BUFFER_H_
-
 /**
  * @addtogroup OH_NativeBuffer
  * @{
@@ -39,6 +36,9 @@
  * @version 1.0
  */
 
+#ifndef NDK_INCLUDE_NATIVE_BUFFER_H_
+#define NDK_INCLUDE_NATIVE_BUFFER_H_
+
 #include <stdint.h>
 #include <native_window/external_window.h>
 #include <native_buffer/buffer_common.h>
diff --git a/graphic/graphic_2d/native_image/native_image.h b/graphic/graphic_2d/native_image/native_image.h
index 795a30d826a..42358fe82e7 100644
--- a/graphic/graphic_2d/native_image/native_image.h
+++ b/graphic/graphic_2d/native_image/native_image.h
@@ -13,9 +13,6 @@
  * limitations under the License.
  */
 
-#ifndef NDK_INCLUDE_NATIVE_IMAGE_H_
-#define NDK_INCLUDE_NATIVE_IMAGE_H_
-
 /**
  * @addtogroup OH_NativeImage
  * @{
@@ -39,6 +36,9 @@
  * @version 1.0
  */
 
+#ifndef NDK_INCLUDE_NATIVE_IMAGE_H_
+#define NDK_INCLUDE_NATIVE_IMAGE_H_
+
 #include <stdint.h>
 
 #ifdef __cplusplus
diff --git a/graphic/graphic_2d/native_vsync/native_vsync.h b/graphic/graphic_2d/native_vsync/native_vsync.h
index 610fe1debc2..65890146c89 100644
--- a/graphic/graphic_2d/native_vsync/native_vsync.h
+++ b/graphic/graphic_2d/native_vsync/native_vsync.h
@@ -13,9 +13,6 @@
  * limitations under the License.
  */
 
-#ifndef NDK_INCLUDE_NATIVE_VSYNC_H_
-#define NDK_INCLUDE_NATIVE_VSYNC_H_
-
 /**
  * @addtogroup NativeVsync
  * @{
@@ -39,6 +36,9 @@
  * @version 1.0
  */
 
+#ifndef NDK_INCLUDE_NATIVE_VSYNC_H_
+#define NDK_INCLUDE_NATIVE_VSYNC_H_
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -118,4 +118,5 @@ int OH_NativeVSync_GetPeriod(OH_NativeVSync* nativeVsync, long long* period);
 }
 #endif
 
+/** @} */
 #endif
\ No newline at end of file
diff --git a/graphic/graphic_2d/native_window/buffer_handle.h b/graphic/graphic_2d/native_window/buffer_handle.h
index a5e3a13cfb1..441af5e75b8 100644
--- a/graphic/graphic_2d/native_window/buffer_handle.h
+++ b/graphic/graphic_2d/native_window/buffer_handle.h
@@ -13,9 +13,6 @@
  * limitations under the License.
  */
 
-#ifndef INCLUDE_BUFFER_HANDLE_H
-#define INCLUDE_BUFFER_HANDLE_H
-
 /**
  * @addtogroup NativeWindow
  * @{
@@ -39,6 +36,9 @@
  * @version 1.0
  */
 
+#ifndef INCLUDE_BUFFER_HANDLE_H
+#define INCLUDE_BUFFER_HANDLE_H
+
 #include <stdint.h>
 
 #ifdef __cplusplus
@@ -65,4 +65,5 @@ typedef struct {
 }
 #endif
 
+/** @} */
 #endif // INCLUDE_BUFFER_HANDLE_H
diff --git a/graphic/graphic_2d/native_window/external_window.h b/graphic/graphic_2d/native_window/external_window.h
index 47a407ff052..54ae4efe5b7 100644
--- a/graphic/graphic_2d/native_window/external_window.h
+++ b/graphic/graphic_2d/native_window/external_window.h
@@ -13,9 +13,6 @@
  * limitations under the License.
  */
 
-#ifndef NDK_INCLUDE_EXTERNAL_NATIVE_WINDOW_H_
-#define NDK_INCLUDE_EXTERNAL_NATIVE_WINDOW_H_
-
 /**
  * @addtogroup NativeWindow
  * @{
@@ -39,6 +36,9 @@
  * @version 1.0
  */
 
+#ifndef NDK_INCLUDE_EXTERNAL_NATIVE_WINDOW_H_
+#define NDK_INCLUDE_EXTERNAL_NATIVE_WINDOW_H_
+
 #include <stdint.h>
 #include "buffer_handle.h"
 #include "../native_buffer/buffer_common.h"
diff --git a/graphic/graphic_2d/native_window/graphic_error_code.h b/graphic/graphic_2d/native_window/graphic_error_code.h
index 1b5e9deb016..1c16d7b95f1 100644
--- a/graphic/graphic_2d/native_window/graphic_error_code.h
+++ b/graphic/graphic_2d/native_window/graphic_error_code.h
@@ -13,9 +13,6 @@
  * limitations under the License.
  */
 
-#ifndef INCLUDE_GRAPHIC_ERROR_CODE_H
-#define INCLUDE_GRAPHIC_ERROR_CODE_H
-
 /**
  * @addtogroup NativeWindow
  * @{
@@ -39,6 +36,9 @@
  * @version 1.0
  */
 
+#ifndef INCLUDE_GRAPHIC_ERROR_CODE_H
+#define INCLUDE_GRAPHIC_ERROR_CODE_H
+
 #include <stdint.h>
 
 #ifdef __cplusplus
-- 
Gitee