From a7dbeb5d76c4f3883a6012a1c3754727a7a53413 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Fri, 11 Apr 2025 23:37:17 +0200 Subject: [PATCH] discord-rpc: Add copyright --- 3rdparty/discord-rpc/discord_backoff.h | 28 +++++++++++++++- 3rdparty/discord-rpc/discord_connection.h | 28 +++++++++++++++- .../discord-rpc/discord_connection_unix.cpp | 23 +++++++++++++ .../discord-rpc/discord_connection_win.cpp | 23 +++++++++++++ 3rdparty/discord-rpc/discord_msg_queue.h | 28 +++++++++++++++- 3rdparty/discord-rpc/discord_register.h | 28 +++++++++++++++- .../discord-rpc/discord_register_linux.cpp | 23 +++++++++++++ 3rdparty/discord-rpc/discord_register_osx.m | 23 +++++++++++++ 3rdparty/discord-rpc/discord_register_win.cpp | 24 ++++++++++++++ 3rdparty/discord-rpc/discord_rpc.cpp | 23 +++++++++++++ 3rdparty/discord-rpc/discord_rpc.h | 33 +++++++++++++++++-- .../discord-rpc/discord_rpc_connection.cpp | 23 +++++++++++++ 3rdparty/discord-rpc/discord_rpc_connection.h | 28 +++++++++++++++- .../discord-rpc/discord_serialization.cpp | 23 +++++++++++++ 3rdparty/discord-rpc/discord_serialization.h | 28 +++++++++++++++- 15 files changed, 377 insertions(+), 9 deletions(-) diff --git a/3rdparty/discord-rpc/discord_backoff.h b/3rdparty/discord-rpc/discord_backoff.h index 26f418175..46dff7e9b 100644 --- a/3rdparty/discord-rpc/discord_backoff.h +++ b/3rdparty/discord-rpc/discord_backoff.h @@ -1,4 +1,28 @@ -#pragma once +/* + * Copyright 2017 Discord, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +#ifndef DISCORD_BACKOFF_H +#define DISCORD_BACKOFF_H #include #include @@ -35,3 +59,5 @@ struct Backoff { }; } // namespace discord_rpc + +#endif // DISCORD_BACKOFF_H diff --git a/3rdparty/discord-rpc/discord_connection.h b/3rdparty/discord-rpc/discord_connection.h index 49548c7a8..6a1edf30c 100644 --- a/3rdparty/discord-rpc/discord_connection.h +++ b/3rdparty/discord-rpc/discord_connection.h @@ -1,4 +1,28 @@ -#pragma once +/* + * Copyright 2017 Discord, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +#ifndef DISCORD_CONNECTION_H +#define DISCORD_CONNECTION_H // This is to wrap the platform specific kinds of connect/read/write. @@ -20,3 +44,5 @@ struct BaseConnection { }; } // namespace discord_rpc + +#endif // DISCORD_CONNECTION_H diff --git a/3rdparty/discord-rpc/discord_connection_unix.cpp b/3rdparty/discord-rpc/discord_connection_unix.cpp index fcfb742a2..7ef6d55d6 100644 --- a/3rdparty/discord-rpc/discord_connection_unix.cpp +++ b/3rdparty/discord-rpc/discord_connection_unix.cpp @@ -1,3 +1,26 @@ +/* + * Copyright 2017 Discord, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + #include "discord_connection.h" #include diff --git a/3rdparty/discord-rpc/discord_connection_win.cpp b/3rdparty/discord-rpc/discord_connection_win.cpp index 698e0d0e7..187eedf50 100644 --- a/3rdparty/discord-rpc/discord_connection_win.cpp +++ b/3rdparty/discord-rpc/discord_connection_win.cpp @@ -1,3 +1,26 @@ +/* + * Copyright 2017 Discord, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + #include "discord_connection.h" #define WIN32_LEAN_AND_MEAN diff --git a/3rdparty/discord-rpc/discord_msg_queue.h b/3rdparty/discord-rpc/discord_msg_queue.h index 9420c96ea..f13da800a 100644 --- a/3rdparty/discord-rpc/discord_msg_queue.h +++ b/3rdparty/discord-rpc/discord_msg_queue.h @@ -1,4 +1,28 @@ -#pragma once +/* + * Copyright 2017 Discord, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +#ifndef DISCORD_MSG_QUEUE_H +#define DISCORD_MSG_QUEUE_H #include @@ -36,3 +60,5 @@ class MsgQueue { }; } // namespace discord_rpc + +#endif // DISCORD_MSG_QUEUE_H diff --git a/3rdparty/discord-rpc/discord_register.h b/3rdparty/discord-rpc/discord_register.h index c8e29755a..4e82fe9a4 100644 --- a/3rdparty/discord-rpc/discord_register.h +++ b/3rdparty/discord-rpc/discord_register.h @@ -1,4 +1,28 @@ -#pragma once +/* + * Copyright 2017 Discord, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +#ifndef DISCORD_REGISTER_H +#define DISCORD_REGISTER_H #ifdef __cplusplus extern "C" { @@ -9,3 +33,5 @@ void Discord_Register(const char *applicationId, const char *command); #ifdef __cplusplus } #endif + +#endif // DISCORD_REGISTER_H diff --git a/3rdparty/discord-rpc/discord_register_linux.cpp b/3rdparty/discord-rpc/discord_register_linux.cpp index 855e75be6..554c7da37 100644 --- a/3rdparty/discord-rpc/discord_register_linux.cpp +++ b/3rdparty/discord-rpc/discord_register_linux.cpp @@ -1,3 +1,26 @@ +/* + * Copyright 2017 Discord, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + #include "discord_rpc.h" #include "discord_register.h" diff --git a/3rdparty/discord-rpc/discord_register_osx.m b/3rdparty/discord-rpc/discord_register_osx.m index 663f73c15..8226da8a4 100644 --- a/3rdparty/discord-rpc/discord_register_osx.m +++ b/3rdparty/discord-rpc/discord_register_osx.m @@ -1,3 +1,26 @@ +/* + * Copyright 2017 Discord, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + #include #include diff --git a/3rdparty/discord-rpc/discord_register_win.cpp b/3rdparty/discord-rpc/discord_register_win.cpp index 8c3ccf0e3..be177b6b7 100644 --- a/3rdparty/discord-rpc/discord_register_win.cpp +++ b/3rdparty/discord-rpc/discord_register_win.cpp @@ -1,3 +1,26 @@ +/* + * Copyright 2017 Discord, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + #include "discord_rpc.h" #include "discord_register.h" @@ -5,6 +28,7 @@ #define NOMCX #define NOSERVICE #define NOIME + #include #include #include diff --git a/3rdparty/discord-rpc/discord_rpc.cpp b/3rdparty/discord-rpc/discord_rpc.cpp index 26e1da74a..a16db32c3 100644 --- a/3rdparty/discord-rpc/discord_rpc.cpp +++ b/3rdparty/discord-rpc/discord_rpc.cpp @@ -1,3 +1,26 @@ +/* + * Copyright 2017 Discord, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + #include #include #include diff --git a/3rdparty/discord-rpc/discord_rpc.h b/3rdparty/discord-rpc/discord_rpc.h index 285da7689..81382bfb4 100644 --- a/3rdparty/discord-rpc/discord_rpc.h +++ b/3rdparty/discord-rpc/discord_rpc.h @@ -1,5 +1,30 @@ -#pragma once -#include +/* + * Copyright 2017 Discord, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +#ifndef DISCORD_RPC_H +#define DISCORD_RPC_H + +#include namespace discord_rpc { @@ -65,6 +90,8 @@ void Discord_UpdateHandlers(DiscordEventHandlers *handlers); #ifdef __cplusplus } /* extern "C" */ +#endif + } // namespace discord_rpc -#endif +#endif // DISCORD_RPC_H diff --git a/3rdparty/discord-rpc/discord_rpc_connection.cpp b/3rdparty/discord-rpc/discord_rpc_connection.cpp index 7673acff3..94dc1c49f 100644 --- a/3rdparty/discord-rpc/discord_rpc_connection.cpp +++ b/3rdparty/discord-rpc/discord_rpc_connection.cpp @@ -1,3 +1,26 @@ +/* + * Copyright 2017 Discord, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + #include "discord_rpc_connection.h" #include "discord_serialization.h" diff --git a/3rdparty/discord-rpc/discord_rpc_connection.h b/3rdparty/discord-rpc/discord_rpc_connection.h index b2cca1c74..550c8aea5 100644 --- a/3rdparty/discord-rpc/discord_rpc_connection.h +++ b/3rdparty/discord-rpc/discord_rpc_connection.h @@ -1,4 +1,28 @@ -#pragma once +/* + * Copyright 2017 Discord, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +#ifndef DISCORD_RPC_CONNECTION_H +#define DISCORD_RPC_CONNECTION_H #include "discord_connection.h" #include "discord_serialization.h" @@ -60,3 +84,5 @@ struct RpcConnection { }; } // namespace discord_rpc + +#endif // DISCORD_RPC_CONNECTION_H diff --git a/3rdparty/discord-rpc/discord_serialization.cpp b/3rdparty/discord-rpc/discord_serialization.cpp index 18ab4b26b..d7f1c5b87 100644 --- a/3rdparty/discord-rpc/discord_serialization.cpp +++ b/3rdparty/discord-rpc/discord_serialization.cpp @@ -1,3 +1,26 @@ +/* + * Copyright 2017 Discord, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + #include "discord_serialization.h" #include "discord_connection.h" #include "discord_rpc.h" diff --git a/3rdparty/discord-rpc/discord_serialization.h b/3rdparty/discord-rpc/discord_serialization.h index be8838e32..65c6e05eb 100644 --- a/3rdparty/discord-rpc/discord_serialization.h +++ b/3rdparty/discord-rpc/discord_serialization.h @@ -1,4 +1,28 @@ -#pragma once +/* + * Copyright 2017 Discord, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is furnished to do + * so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + */ + +#ifndef DISCORD_SERIALIZATION_H +#define DISCORD_SERIALIZATION_H #include #include @@ -184,3 +208,5 @@ inline const char *GetStrMember(JsonValue *obj, const char *name, const char *no } } // namespace discord_rpc + +#endif // DISCORD_SERIALIZATION_H