File vita3k-stdint.patch of Package vita3k

Overview Repositories Revisions Requests Users Attributes Meta

File vita3k-stdint.patch of Package vita3k (Revision 0e00b2f19ddc77a88b62d84c0dabd215)

Currently displaying revision 0e00b2f19ddc77a88b62d84c0dabd215 , Show latest

diff --git a/vita3k/compat/include/compat/state.h b/vita3k/compat/include/compat/state.h
index 9c6cbc04..b384c1c3 100644
--- a/vita3k/compat/include/compat/state.h
+++ b/vita3k/compat/include/compat/state.h
@@ -19,6 +19,7 @@
 
 #include <imgui.h>
 #include <map>
+#include <stdint.h>
 #include <string>
 
 namespace compat {
diff --git a/vita3k/cpu/include/cpu/disasm/functions.h b/vita3k/cpu/include/cpu/disasm/functions.h
index a4563d5a..9bbc9312 100644
--- a/vita3k/cpu/include/cpu/disasm/functions.h
+++ b/vita3k/cpu/include/cpu/disasm/functions.h
@@ -17,6 +17,7 @@
 
 #pragma once
 
+#include <stdint.h>
 #include <string>
 
 struct DisasmState;
diff --git a/vita3k/crypto/include/crypto/hash.h b/vita3k/crypto/include/crypto/hash.h
index bf2865ff..c61164c3 100644
--- a/vita3k/crypto/include/crypto/hash.h
+++ b/vita3k/crypto/include/crypto/hash.h
@@ -18,6 +18,7 @@
 #pragma once
 
 #include <array>
+#include <stdint.h>
 #include <string>
 
 using Sha256Hash = std::array<uint8_t, 32>;
@@ -25,7 +26,7 @@ using Sha256Hash = std::array<uint8_t, 32>;
 Sha256Hash sha256(const void *data, size_t size);
 typedef std::array<char, 65> Sha256HashText;
 
-void hex_buf(const std::uint8_t *hash, char *dst, const std::size_t source_size);
+void hex_buf(const uint8_t *hash, char *dst, const std::size_t source_size);
 
 template <size_t N>
 const std::string hex_string(const std::array<uint8_t, N> &hash) {
diff --git a/vita3k/crypto/src/hash.cpp b/vita3k/crypto/src/hash.cpp
index 85eda22b..74435425 100644
--- a/vita3k/crypto/src/hash.cpp
+++ b/vita3k/crypto/src/hash.cpp
@@ -32,7 +32,7 @@ Sha256Hash sha256(const void *data, size_t size) {
     return hash;
 }
 
-void hex_buf(const std::uint8_t *hash, char *dst, const std::size_t source_size) {
+void hex_buf(const uint8_t *hash, char *dst, const std::size_t source_size) {
     const char hex[17] = "0123456789abcdef";
     size_t j = 0;
     for (size_t i = 0; i < source_size; ++i) {
diff --git a/vita3k/np/include/np/trophy/trp_parser.h b/vita3k/np/include/np/trophy/trp_parser.h
index 00b5b656..76f3c23b 100644
--- a/vita3k/np/include/np/trophy/trp_parser.h
+++ b/vita3k/np/include/np/trophy/trp_parser.h
@@ -19,6 +19,7 @@
 
 #include <fstream>
 #include <functional>
+#include <stdint.h>
 #include <string>
 #include <vector>
 
@@ -26,13 +27,13 @@ namespace np::trophy {
 
 struct TRPEntry {
     std::string filename;
-    std::uint64_t offset;
-    std::uint64_t size;
+    uint64_t offset;
+    uint64_t size;
 };
 
 using TRPSeekFunc = std::function<bool(int amount)>;
-using TRPReadFunc = std::function<bool(void *source, std::uint32_t amount)>;
-using TRPWriteFunc = std::function<bool(void *dest, std::uint32_t amount)>;
+using TRPReadFunc = std::function<bool(void *source, uint32_t amount)>;
+using TRPWriteFunc = std::function<bool(void *dest, uint32_t amount)>;
 
 struct TRPFile {
     std::vector<TRPEntry> entries;
@@ -44,8 +45,8 @@ struct TRPFile {
 
     explicit TRPFile() = default;
 
-    bool get_entry_data(const std::uint32_t idx, TRPWriteFunc write_func);
-    const std::int32_t search_file(const char *name);
+    bool get_entry_data(const uint32_t idx, TRPWriteFunc write_func);
+    const int32_t search_file(const char *name);
 };
 
 } // namespace np::trophy
diff --git a/vita3k/np/src/trophy/trp_parser.cpp b/vita3k/np/src/trophy/trp_parser.cpp
index fe80f04a..1e57ab78 100644
--- a/vita3k/np/src/trophy/trp_parser.cpp
+++ b/vita3k/np/src/trophy/trp_parser.cpp
@@ -22,10 +22,10 @@
 
 namespace np::trophy {
 
-static constexpr std::uint32_t NP_TRP_HEADER_MAGIC = 0x004DA2DC;
+static constexpr uint32_t NP_TRP_HEADER_MAGIC = 0x004DA2DC;
 
 bool TRPFile::header_parse() {
-    std::uint32_t magic = 0;
+    uint32_t magic = 0;
     if (!read_func(&magic, 4) || magic != NP_TRP_HEADER_MAGIC) {
         // Magic not match.... Return
         return false;
@@ -34,8 +34,8 @@ bool TRPFile::header_parse() {
     // Seek and read entry count and start of data section
     seek_func(0x10);
 
-    std::int32_t entry_count = 0;
-    std::int32_t entry_info_off = 0;
+    int32_t entry_count = 0;
+    int32_t entry_info_off = 0;
     if (!read_func(&entry_count, 4)) {
         return false;
     }
@@ -55,7 +55,7 @@ bool TRPFile::header_parse() {
     seek_func(entry_info_off);
 
     // Start reading all entry infos
-    for (std::int32_t i = 0; i < entry_count; i++) {
+    for (int32_t i = 0; i < entry_count; i++) {
         // Read null terminated string. That's the filename
         char temp = 0;
 
@@ -91,7 +91,7 @@ bool TRPFile::header_parse() {
     return true;
 }
 
-bool TRPFile::get_entry_data(const std::uint32_t idx, TRPWriteFunc write_func) {
+bool TRPFile::get_entry_data(const uint32_t idx, TRPWriteFunc write_func) {
     // Check if the index is not out of range
     if (idx >= entries.size()) {
         return false;
@@ -103,14 +103,14 @@ bool TRPFile::get_entry_data(const std::uint32_t idx, TRPWriteFunc write_func) {
     }
 
     // Read chunk by chunk and write to out
-    static constexpr std::uint32_t COPY_CHUNK_SIZE = 0x10000;
-    std::uint64_t bytes_left = entries[idx].size;
+    static constexpr uint32_t COPY_CHUNK_SIZE = 0x10000;
+    uint64_t bytes_left = entries[idx].size;
 
     std::vector<char> copy_buffer;
     copy_buffer.resize(COPY_CHUNK_SIZE);
 
     while (bytes_left != 0) {
-        const std::uint32_t copy_size = std::min<std::uint32_t>(static_cast<std::uint32_t>(bytes_left),
+        const uint32_t copy_size = std::min<uint32_t>(static_cast<uint32_t>(bytes_left),
             COPY_CHUNK_SIZE);
 
         if (!read_func(&copy_buffer[0], copy_size)) {
@@ -127,11 +127,11 @@ bool TRPFile::get_entry_data(const std::uint32_t idx, TRPWriteFunc write_func) {
     return true;
 }
 
-const std::int32_t TRPFile::search_file(const char *name) {
+const int32_t TRPFile::search_file(const char *name) {
     auto name_len = strlen(name);
     for (std::size_t i = 0; i < entries.size(); i++) {
         if (strncmp(entries[i].filename.c_str(), name, name_len) == 0) {
-            return static_cast<std::int32_t>(i);
+            return static_cast<int32_t>(i);
         }
     }

Places

File vita3k-stdint.patch of Package vita3k (Revision 0e00b2f19ddc77a88b62d84c0dabd215)

Places