timoreo/olm
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix 3ds build

Browse source
This commit is contained in:
timoreo 2023-12-09 14:48:21 +01:00
parent 7e0c827703
commit cb3fe622ae
Signed by: timoreo
GPG key ID: 121A72C3512BA288
6 changed files with 132 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/olm/olm_export.h
View file

@ -9,15 +9,15 @@
# ifndef OLM_EXPORT # ifndef OLM_EXPORT
# ifdef olm_EXPORTS # ifdef olm_EXPORTS
/* We are building this library */ /* We are building this library */
# define OLM_EXPORT __attribute__((visibility("default"))) # define OLM_EXPORT
# else # else
/* We are using this library */ /* We are using this library */
# define OLM_EXPORT __attribute__((visibility("default"))) # define OLM_EXPORT
# endif # endif
# endif # endif
# ifndef OLM_NO_EXPORT # ifndef OLM_NO_EXPORT
# define OLM_NO_EXPORT __attribute__((visibility("hidden"))) # define OLM_NO_EXPORT
# endif # endif
#endif #endif

6
lib/crypto-algorithms/aes.h
View file

@ -11,13 +11,13 @@
/*************************** HEADER FILES ***************************/ /*************************** HEADER FILES ***************************/
#include <stddef.h> #include <stddef.h>
#include <stdint.h>
/****************************** MACROS ******************************/ /****************************** MACROS ******************************/
#define AES_BLOCK_SIZE 16 // AES operates on 16 bytes at a time #define AES_BLOCK_SIZE 16 // AES operates on 16 bytes at a time
/**************************** DATA TYPES ****************************/ /**************************** DATA TYPES ****************************/
typedef unsigned char BYTE; // 8-bit byte typedef uint8_t BYTE; // 8-bit byte
typedef unsigned int WORD; // 32-bit word, change to "long" for 16-bit machines typedef uint32_t WORD; // 32-bit word, change to "long" for 16-bit machines
/*********************** FUNCTION DECLARATIONS **********************/ /*********************** FUNCTION DECLARATIONS **********************/
/////////////////// ///////////////////

5
lib/crypto-algorithms/sha256.h
View file

@ -11,13 +11,14 @@
/*************************** HEADER FILES ***************************/ /*************************** HEADER FILES ***************************/
#include <stddef.h> #include <stddef.h>
#include <stdint.h>
/****************************** MACROS ******************************/ /****************************** MACROS ******************************/
#define SHA256_BLOCK_SIZE 32 // SHA256 outputs a 32 byte digest #define SHA256_BLOCK_SIZE 32 // SHA256 outputs a 32 byte digest
/**************************** DATA TYPES ****************************/ /**************************** DATA TYPES ****************************/
typedef unsigned char BYTE; // 8-bit byte typedef uint8_t BYTE; // 8-bit byte
typedef unsigned int WORD; // 32-bit word, change to "long" for 16-bit machines typedef uint32_t WORD; // 32-bit word, change to "long" for 16-bit machines
typedef struct { typedef struct {
BYTE data[64]; BYTE data[64];

2
lib/doctest/doctest/doctest.h
View file

@ -4498,7 +4498,7 @@ namespace {
sigaltstack(&sigStack, &oldSigStack); sigaltstack(&sigStack, &oldSigStack);
struct sigaction sa = {}; struct sigaction sa = {};
sa.sa_handler = handleSignal; // NOLINT sa.sa_handler = handleSignal; // NOLINT
sa.sa_flags = SA_ONSTACK; sa.sa_flags = SS_ONSTACK;
for(std::size_t i = 0; i < DOCTEST_COUNTOF(signalDefs); ++i) { for(std::size_t i = 0; i < DOCTEST_COUNTOF(signalDefs); ++i) {
sigaction(signalDefs[i].id, &sa, &oldSigActions[i]); sigaction(signalDefs[i].id, &sa, &oldSigActions[i]);
} }

2
lib/doctest/doctest/parts/doctest.cpp
View file

@ -1684,7 +1684,7 @@ namespace {
sigaltstack(&sigStack, &oldSigStack); sigaltstack(&sigStack, &oldSigStack);
struct sigaction sa = {}; struct sigaction sa = {};
sa.sa_handler = handleSignal; // NOLINT sa.sa_handler = handleSignal; // NOLINT
sa.sa_flags = SA_ONSTACK; sa.sa_flags = SS_ONSTACK;
for(std::size_t i = 0; i < DOCTEST_COUNTOF(signalDefs); ++i) { for(std::size_t i = 0; i < DOCTEST_COUNTOF(signalDefs); ++i) {
sigaction(signalDefs[i].id, &sa, &oldSigActions[i]); sigaction(signalDefs[i].id, &sa, &oldSigActions[i]);
} }

2
tests/include/doctest.h
View file

@ -4498,7 +4498,7 @@ namespace {
sigaltstack(&sigStack, &oldSigStack); sigaltstack(&sigStack, &oldSigStack);
struct sigaction sa = {}; struct sigaction sa = {};
sa.sa_handler = handleSignal; // NOLINT sa.sa_handler = handleSignal; // NOLINT
sa.sa_flags = SA_ONSTACK; sa.sa_flags = SS_ONSTACK;
for(std::size_t i = 0; i < DOCTEST_COUNTOF(signalDefs); ++i) { for(std::size_t i = 0; i < DOCTEST_COUNTOF(signalDefs); ++i) {
sigaction(signalDefs[i].id, &sa, &oldSigActions[i]); sigaction(signalDefs[i].id, &sa, &oldSigActions[i]);
} }