mirror of
				https://github.com/godotengine/godot.git
				synced 2025-10-31 13:41:03 +00:00 
			
		
		
		
	 efc0a5a481
			
		
	
	
		efc0a5a481
		
	
	
	
	
		
			
			The comment mentioned a conflict with libwebsockets, but we actually
still get this conflict even now that we don't use libwebsockets.
Not sure what component is clashing but we should basically just keep
this patch.
Follow-up to #36823.
(cherry picked from commit 8189abd64a)
		
	
			
		
			
				
	
	
		
			13 lines
		
	
	
	
		
			324 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			13 lines
		
	
	
	
		
			324 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
| --- a/thirdparty/mbedtls/include/mbedtls/config.h
 | |
| +++ b/thirdparty/mbedtls/include/mbedtls/config.h
 | |
| @@ -2477,7 +2477,9 @@
 | |
|   *
 | |
|   * This modules adds support for the VIA PadLock on x86.
 | |
|   */
 | |
| -#define MBEDTLS_PADLOCK_C
 | |
| +// -- GODOT start --
 | |
| +// #define MBEDTLS_PADLOCK_C
 | |
| +// -- GODOT end --
 | |
|  
 | |
|  /**
 | |
|   * \def MBEDTLS_PEM_PARSE_C
 |