From 97d82808b81b08972a872d5aeeeac5a5a3e954c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Fri, 11 Mar 2022 13:29:41 +0200
Subject: Fix clang -Wtypedef-redefinition

This fixes commit 77c184df7c056da7364e606ac977cc2d3cd826ad.
---
 storage/maria/ma_check.h  | 10 +++++-----
 storage/maria/maria_def.h |  8 ++++----
 storage/maria/s3_func.h   |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'storage/maria')

diff --git a/storage/maria/ma_check.h b/storage/maria/ma_check.h
index 1c2a971098d..fa78ada6d38 100644
--- a/storage/maria/ma_check.h
+++ b/storage/maria/ma_check.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2019 MariaDB Corporation AB
+/* Copyright (C) 2019, 2022, MariaDB Corporation AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,17 +20,17 @@
   in myisamchk.h
 */
 
-typedef struct st_sort_key_blocks		/* Used when sorting */
+struct st_sort_key_blocks		/* Used when sorting */
 {
   uchar *buff, *end_pos;
   uchar lastkey[MARIA_MAX_POSSIBLE_KEY_BUFF];
   uint last_length;
   int inited;
-} MA_SORT_KEY_BLOCKS;
+};
 
-typedef struct st_sort_ftbuf
+struct st_sort_ftbuf
 {
   uchar *buf, *end;
   int count;
   uchar lastkey[MARIA_MAX_KEY_BUFF];
-} MA_SORT_FT_BUF;
+};
diff --git a/storage/maria/maria_def.h b/storage/maria/maria_def.h
index fe050dbf03a..2107444940d 100644
--- a/storage/maria/maria_def.h
+++ b/storage/maria/maria_def.h
@@ -150,21 +150,21 @@ struct st_maria_share;
 struct st_maria_handler;                        /* For referense */
 struct st_maria_keydef;
 
-typedef struct st_maria_key                 /* Internal info about a key */
+struct st_maria_key                 /* Internal info about a key */
 {
   uchar *data;                              /* Data for key */
   struct st_maria_keydef *keyinfo;          /* Definition for key */
   uint data_length;                         /* Length of key data */
   uint ref_length;                          /* record ref + transid */
   uint32 flag;                               /* 0 or SEARCH_PART_KEY */
-} MARIA_KEY;
+};
 
-typedef struct st_maria_decode_tree     /* Decode huff-table */
+struct st_maria_decode_tree     /* Decode huff-table */
 {
   uint16 *table;
   uint quick_table_bits;
   uchar *intervalls;
-} MARIA_DECODE_TREE;
+};
 
 
 typedef struct s3_info S3_INFO;
diff --git a/storage/maria/s3_func.h b/storage/maria/s3_func.h
index bd5275494bc..a062131d5a5 100644
--- a/storage/maria/s3_func.h
+++ b/storage/maria/s3_func.h
@@ -1,6 +1,6 @@
 #ifndef S3_FUNC_INCLUDED
 #define S3_FUNC_INCLUDED
-/* Copyright (C) 2019, 2020 MariaDB Corporation Ab
+/* Copyright (C) 2019, 2022, MariaDB Corporation Ab
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -41,7 +41,7 @@ extern TYPELIB s3_protocol_typelib;
 
 /* Store information about a s3 connection */
 
-typedef struct s3_info
+struct s3_info
 {
   /* Connection strings */
   LEX_CSTRING access_key, secret_key, region, bucket, host_name;
@@ -63,7 +63,7 @@ typedef struct s3_info
 
   /* Protocol for the list bucket API call. 1 for Amazon, 2 for some others */
   uint8_t protocol_version;
-} S3_INFO;
+};
 
 
 /* flag + length is stored in this header */
-- 
cgit v1.2.1