More "#pragma once" handling for the OS3 build

jens-maus · Dec 7, 2023 · 9c4687b · 9c4687b
1 parent d8485f7
commit 9c4687b
Show file tree

Hide file tree

Showing 23 changed files with 69 additions and 23 deletions.
diff --git a/openssl/include/crypto/encoder.h b/openssl/include/crypto/encoder.h
@@ -9,7 +9,9 @@
 
 #ifndef OSSL_CRYPTO_ENCODER_H
 # define OSSL_CRYPTO_ENCODER_H
-# pragma once
+# if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
+#  pragma once
+# endif
 
 # include <openssl/types.h>
 

diff --git a/openssl/include/crypto/md32_common.h b/openssl/include/crypto/md32_common.h
@@ -65,7 +65,9 @@
 
 #ifndef OSSL_CRYPTO_MD32_COMMON_H
 # define OSSL_CRYPTO_MD32_COMMON_H
-# pragma once
+# if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
+#  pragma once
+# endif
 
 # include <openssl/crypto.h>
 

diff --git a/openssl/include/internal/der.h b/openssl/include/internal/der.h
@@ -9,7 +9,9 @@
 
 #ifndef OSSL_INTERNAL_DER_H
 # define OSSL_INTERNAL_DER_H
-# pragma once
+# if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
+#  pragma once
+# endif
 
 # include <openssl/bn.h>
 # include "internal/packet.h"

diff --git a/openssl/include/internal/deterministic_nonce.h b/openssl/include/internal/deterministic_nonce.h
@@ -9,7 +9,9 @@
 
 #ifndef OSSL_INTERNAL_DETERMINISTIC_NONCE_H
 # define OSSL_INTERNAL_DETERMINISTIC_NONCE_H
-# pragma once
+# if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
+#  pragma once
+# endif
 
 # include <openssl/bn.h>
 

diff --git a/openssl/include/internal/event_queue.h b/openssl/include/internal/event_queue.h
@@ -9,7 +9,9 @@
 
 #ifndef OSSL_INTERNAL_EVENT_QUEUE_H
 # define OSSL_INTERNAL_EVENT_QUEUE_H
-# pragma once
+# if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
+#  pragma once
+# endif
 
 # include "internal/priority_queue.h"
 # include "internal/time.h"

diff --git a/openssl/include/internal/hpke_util.h b/openssl/include/internal/hpke_util.h
@@ -9,7 +9,9 @@
 
 #ifndef OSSL_INTERNAL_HPKE_UTIL_H
 # define OSSL_INTERNAL_HPKE_UTIL_H
-# pragma once
+# if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
+#  pragma once
+# endif
 
 /* Constants from RFC 9180 Section 7.1 and 7.3 */
 # define OSSL_HPKE_MAX_SECRET 64

diff --git a/openssl/include/internal/list.h b/openssl/include/internal/list.h
@@ -9,7 +9,9 @@
 
 #ifndef OSSL_INTERNAL_LIST_H
 # define OSSL_INTERNAL_LIST_H
-# pragma once
+# if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
+#  pragma once
+# endif
 
 # include <string.h>
 # include <assert.h>

diff --git a/openssl/include/internal/packet_quic.h b/openssl/include/internal/packet_quic.h
@@ -9,7 +9,9 @@
 
 #ifndef OSSL_INTERNAL_PACKET_QUIC_H
 # define OSSL_INTERNAL_PACKET_QUIC_H
-# pragma once
+# if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
+#  pragma once
+# endif
 
 # include "internal/packet.h"
 # include "internal/quic_vlint.h"

diff --git a/openssl/include/internal/priority_queue.h b/openssl/include/internal/priority_queue.h
@@ -9,7 +9,9 @@
 
 #ifndef OSSL_INTERNAL_PRIORITY_QUEUE_H
 # define OSSL_INTERNAL_PRIORITY_QUEUE_H
-# pragma once
+# if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
+#  pragma once
+# endif
 
 # include <stdlib.h>
 # include <openssl/e_os2.h>

diff --git a/openssl/include/internal/quic_stream.h b/openssl/include/internal/quic_stream.h
@@ -9,7 +9,9 @@
 
 #ifndef OSSL_INTERNAL_QUIC_STREAM_H
 # define OSSL_INTERNAL_QUIC_STREAM_H
-# pragma once
+# if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
+#  pragma once
+# endif
 
 #include "internal/e_os.h"
 #include "internal/time.h"

diff --git a/openssl/include/internal/quic_stream_map.h b/openssl/include/internal/quic_stream_map.h
@@ -9,7 +9,9 @@
 
 #ifndef OSSL_INTERNAL_QUIC_STREAM_MAP_H
 # define OSSL_INTERNAL_QUIC_STREAM_MAP_H
-# pragma once
+# if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
+#  pragma once
+# endif
 
 # include "internal/e_os.h"
 # include "internal/time.h"

diff --git a/openssl/include/internal/quic_vlint.h b/openssl/include/internal/quic_vlint.h
@@ -9,7 +9,9 @@
 
 #ifndef OSSL_INTERNAL_QUIC_VLINT_H
 # define OSSL_INTERNAL_QUIC_VLINT_H
-# pragma once
+# if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
+#  pragma once
+# endif
 
 # include "internal/e_os.h"
 

diff --git a/openssl/include/internal/quic_wire.h b/openssl/include/internal/quic_wire.h
@@ -9,7 +9,9 @@
 
 #ifndef OSSL_INTERNAL_QUIC_WIRE_H
 # define OSSL_INTERNAL_QUIC_WIRE_H
-# pragma once
+# if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
+#  pragma once
+# endif
 
 # include "internal/e_os.h"
 # include "internal/time.h"

diff --git a/openssl/include/internal/recordmethod.h b/openssl/include/internal/recordmethod.h
@@ -9,7 +9,9 @@
 
 #ifndef OSSL_INTERNAL_RECORDMETHOD_H
 # define OSSL_INTERNAL_RECORDMETHOD_H
-# pragma once
+# if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
+#  pragma once
+# endif
 
 # include <openssl/ssl.h>
 

diff --git a/openssl/include/internal/ring_buf.h b/openssl/include/internal/ring_buf.h
@@ -9,7 +9,9 @@
 
 #ifndef OSSL_INTERNAL_RING_BUF_H
 # define OSSL_INTERNAL_RING_BUF_H
-# pragma once
+# if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
+#  pragma once
+# endif
 
 # include <openssl/e_os2.h>              /* For 'ossl_inline' */
 # include "internal/safe_math.h"

diff --git a/openssl/include/internal/safe_math.h b/openssl/include/internal/safe_math.h
@@ -9,7 +9,9 @@
 
 #ifndef OSSL_INTERNAL_SAFE_MATH_H
 # define OSSL_INTERNAL_SAFE_MATH_H
-# pragma once
+# if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
+#  pragma once
+# endif
 
 # include <openssl/e_os2.h>              /* For 'ossl_inline' */
 

diff --git a/openssl/include/internal/ssl.h b/openssl/include/internal/ssl.h
@@ -11,7 +11,9 @@
 
 #ifndef OSSL_INTERNAL_SSL_H
 # define OSSL_INTERNAL_SSL_H
-# pragma once
+# if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
+#  pragma once
+# endif
 
 typedef void (*ossl_msg_cb)(int write_p, int version, int content_type,
                             const void *buf, size_t len, SSL *ssl, void *arg);

diff --git a/openssl/include/internal/tsan_assist.h b/openssl/include/internal/tsan_assist.h
@@ -49,7 +49,9 @@
 
 #ifndef OSSL_INTERNAL_TSAN_ASSIST_H
 # define OSSL_INTERNAL_TSAN_ASSIST_H
-# pragma once
+# if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
+#  pragma once
+# endif
 
 # if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L \
     && !defined(__STDC_NO_ATOMICS__)

diff --git a/openssl/providers/implementations/include/prov/ciphercommon.h b/openssl/providers/implementations/include/prov/ciphercommon.h
@@ -9,7 +9,9 @@
 
 #ifndef OSSL_PROV_CIPHERCOMMON_H
 # define OSSL_PROV_CIPHERCOMMON_H
-# pragma once
+# if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
+#  pragma once
+# endif
 
 # include <openssl/params.h>
 # include <openssl/core_dispatch.h>

diff --git a/openssl/providers/implementations/include/prov/ciphercommon_aead.h b/openssl/providers/implementations/include/prov/ciphercommon_aead.h
@@ -9,7 +9,9 @@
 
 #ifndef OSSL_PROV_CIPHERCOMMON_AEAD_H
 # define OSSL_PROV_CIPHERCOMMON_AEAD_H
-# pragma once
+# if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
+#  pragma once
+# endif
 
 # define UNINITIALISED_SIZET ((size_t)-1)
 

diff --git a/openssl/providers/implementations/include/prov/ciphercommon_ccm.h b/openssl/providers/implementations/include/prov/ciphercommon_ccm.h
@@ -9,7 +9,9 @@
 
 #ifndef OSSL_PROV_CIPHERCOMMON_CCM_H
 # define OSSL_PROV_CIPHERCOMMON_CCM_H
-# pragma once
+# if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
+#  pragma once
+# endif
 
 # include "ciphercommon_aead.h"
 

diff --git a/openssl/providers/implementations/include/prov/ciphercommon_gcm.h b/openssl/providers/implementations/include/prov/ciphercommon_gcm.h
@@ -10,7 +10,9 @@
 
 #ifndef OSSL_PROV_CIPHERCOMMON_GCM_H
 # define OSSL_PROV_CIPHERCOMMON_GCM_H
-# pragma once
+# if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
+#  pragma once
+# endif
 
 # include <openssl/aes.h>
 # include "ciphercommon_aead.h"

diff --git a/openssl/providers/implementations/include/prov/hmac_drbg.h b/openssl/providers/implementations/include/prov/hmac_drbg.h
@@ -9,7 +9,9 @@
 
 #ifndef OSSL_PROV_HMAC_DRBG_H
 # define OSSL_PROV_HMAC_DRBG_H
-# pragma once
+# if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
+#  pragma once
+# endif
 
 #include <openssl/evp.h>
 #include "prov/provider_util.h"