include/rtl/string.h  |    8 --------
 include/rtl/ustring.h |    8 --------
 2 files changed, 16 deletions(-)

New commits:
commit 30027d95f96e8732292391721da8d126c8896fec
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Oct 27 11:56:14 2023 +0200
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Oct 27 15:50:09 2023 +0200

    Step 2 of removing cargo-cult pragma pack around rtl_[u]String
    
    see 8ae3ae4bf75fdd0aaa132c956d9da029baa3adc6 "Step 1 of removing cargo-cult
    pragma pack around rtl_[u]String"
    
    Change-Id: Ie9140b92da8895c4991a7f449359bb1747fdb23d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158553
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/include/rtl/string.h b/include/rtl/string.h
index 854a83832c99..26f361529771 100644
--- a/include/rtl/string.h
+++ b/include/rtl/string.h
@@ -864,10 +864,6 @@ SAL_DLLPUBLIC double SAL_CALL rtl_str_toDouble(
 
 /* ======================================================================= */
 
-#ifdef _WIN32
-#   pragma pack(push, 8)
-#endif
-
 /** @cond INTERNAL */
 /** The implementation of a byte string.
  */
@@ -879,10 +875,6 @@ typedef struct _rtl_String
 } rtl_String;
 /** @endcond */
 
-#if defined(_WIN32)
-#pragma pack(pop)
-#endif
-
 /* ----------------------------------------------------------------------- */
 
 /** Increment the reference count of a string.
diff --git a/include/rtl/ustring.h b/include/rtl/ustring.h
index da4278e5a683..303aff446023 100644
--- a/include/rtl/ustring.h
+++ b/include/rtl/ustring.h
@@ -1194,10 +1194,6 @@ SAL_DLLPUBLIC double SAL_CALL rtl_ustr_toDouble(
 
 /* ======================================================================= */
 
-#if defined(_WIN32)
-#pragma pack(push, 4)
-#endif
-
 /** @cond INTERNAL */
 /** The implementation of a Unicode string.
 */
@@ -1209,10 +1205,6 @@ typedef struct SAL_DLLPUBLIC_RTTI _rtl_uString
 } rtl_uString;
 /** @endcond */
 
-#if defined(_WIN32)
-#pragma pack(pop)
-#endif
-
 /* ----------------------------------------------------------------------- */
 
 /** Increment the reference count of a string.

Reply via email to