Standardise header guards.

Using the full path including the repo name.

28 files changed, 63 insertions, 63 deletions

diff --git a/toxcore/DHT.h b/toxcore/DHT.h
index 9f5f1ec7..cbe905ce 100644
--- a/toxcore/DHT.h
+++ b/toxcore/DHT.h
@@ -21,8 +21,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef DHT_H
-#define DHT_H
+#ifndef C_TOXCORE_TOXCORE_DHT_H
+#define C_TOXCORE_TOXCORE_DHT_H
 
 #include "crypto_core.h"
 #include "logger.h"
diff --git a/toxcore/LAN_discovery.api.h b/toxcore/LAN_discovery.api.h
index 515552f7..31d6a5f6 100644
--- a/toxcore/LAN_discovery.api.h
+++ b/toxcore/LAN_discovery.api.h
@@ -22,8 +22,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef LAN_DISCOVERY_H
-#define LAN_DISCOVERY_H
+#ifndef C_TOXCORE_TOXCORE_LAN_DISCOVERY_H
+#define C_TOXCORE_TOXCORE_LAN_DISCOVERY_H
 
 #include "DHT.h"
 %}
@@ -68,5 +68,5 @@ static bool ip_is_local(iP::this ip);
 static bool ip_is_lan(iP::this ip);
 
 %{
-#endif
+#endif // C_TOXCORE_TOXCORE_LAN_DISCOVERY_H
 %}
diff --git a/toxcore/LAN_discovery.h b/toxcore/LAN_discovery.h
index 3e563782..8c48316d 100644
--- a/toxcore/LAN_discovery.h
+++ b/toxcore/LAN_discovery.h
@@ -21,8 +21,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef LAN_DISCOVERY_H
-#define LAN_DISCOVERY_H
+#ifndef C_TOXCORE_TOXCORE_LAN_DISCOVERY_H
+#define C_TOXCORE_TOXCORE_LAN_DISCOVERY_H
 
 #include "DHT.h"
 
diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h
index 09f631ff..b2de6a5a 100644
--- a/toxcore/Messenger.h
+++ b/toxcore/Messenger.h
@@ -22,8 +22,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef MESSENGER_H
-#define MESSENGER_H
+#ifndef C_TOXCORE_TOXCORE_MESSENGER_H
+#define C_TOXCORE_TOXCORE_MESSENGER_H
 
 #include "friend_connection.h"
 #include "friend_requests.h"
diff --git a/toxcore/TCP_client.h b/toxcore/TCP_client.h
index 412e43e2..9d43d642 100644
--- a/toxcore/TCP_client.h
+++ b/toxcore/TCP_client.h
@@ -21,8 +21,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef TCP_CLIENT_H
-#define TCP_CLIENT_H
+#ifndef C_TOXCORE_TOXCORE_TCP_CLIENT_H
+#define C_TOXCORE_TOXCORE_TCP_CLIENT_H
 
 #include "TCP_server.h"
 #include "crypto_core.h"
diff --git a/toxcore/TCP_connection.h b/toxcore/TCP_connection.h
index 8ae9549f..1962fb1a 100644
--- a/toxcore/TCP_connection.h
+++ b/toxcore/TCP_connection.h
@@ -21,8 +21,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef TCP_CONNECTION_H
-#define TCP_CONNECTION_H
+#ifndef C_TOXCORE_TOXCORE_TCP_CONNECTION_H
+#define C_TOXCORE_TOXCORE_TCP_CONNECTION_H
 
 #include "TCP_client.h"
 
diff --git a/toxcore/TCP_server.h b/toxcore/TCP_server.h
index fe05b5a5..1798ebeb 100644
--- a/toxcore/TCP_server.h
+++ b/toxcore/TCP_server.h
@@ -21,8 +21,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef TCP_SERVER_H
-#define TCP_SERVER_H
+#ifndef C_TOXCORE_TOXCORE_TCP_SERVER_H
+#define C_TOXCORE_TOXCORE_TCP_SERVER_H
 
 #include "crypto_core.h"
 #include "list.h"
diff --git a/toxcore/ccompat.h b/toxcore/ccompat.h
index 5b37a294..ba8c7fe8 100644
--- a/toxcore/ccompat.h
+++ b/toxcore/ccompat.h
@@ -1,8 +1,8 @@
 /*
  * C language compatibility macros for varying compiler support.
  */
-#ifndef CCOMPAT_H
-#define CCOMPAT_H
+#ifndef C_TOXCORE_TOXCORE_CCOMPAT_H
+#define C_TOXCORE_TOXCORE_CCOMPAT_H
 
 // Variable length arrays.
 // VLA(type, name, size) allocates a variable length array with automatic
@@ -48,4 +48,4 @@
 #define GNU_PRINTF(f, a)
 #endif
 
-#endif /* CCOMPAT_H */
+#endif // C_TOXCORE_TOXCORE_CCOMPAT_H
diff --git a/toxcore/crypto_core.api.h b/toxcore/crypto_core.api.h
index 9623e5b3..94ccac47 100644
--- a/toxcore/crypto_core.api.h
+++ b/toxcore/crypto_core.api.h
@@ -22,8 +22,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef CRYPTO_CORE_H
-#define CRYPTO_CORE_H
+#ifndef C_TOXCORE_TOXCORE_CRYPTO_CORE_H
+#define C_TOXCORE_TOXCORE_CRYPTO_CORE_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -264,5 +264,5 @@ static void new_symmetric_key(uint8_t[CRYPTO_SYMMETRIC_KEY_SIZE] key);
 }  // extern "C"
 #endif
 
-#endif /* CRYPTO_CORE_H */
+#endif // C_TOXCORE_TOXCORE_CRYPTO_CORE_H
 %}
diff --git a/toxcore/crypto_core.h b/toxcore/crypto_core.h
index 90b86990..b287b21e 100644
--- a/toxcore/crypto_core.h
+++ b/toxcore/crypto_core.h
@@ -21,8 +21,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef CRYPTO_CORE_H
-#define CRYPTO_CORE_H
+#ifndef C_TOXCORE_TOXCORE_CRYPTO_CORE_H
+#define C_TOXCORE_TOXCORE_CRYPTO_CORE_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -249,4 +249,4 @@ void new_symmetric_key(uint8_t *key);
 }  // extern "C"
 #endif
 
-#endif /* CRYPTO_CORE_H */
+#endif // C_TOXCORE_TOXCORE_CRYPTO_CORE_H
diff --git a/toxcore/friend_connection.h b/toxcore/friend_connection.h
index 8a355377..149a4fa7 100644
--- a/toxcore/friend_connection.h
+++ b/toxcore/friend_connection.h
@@ -21,8 +21,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef FRIEND_CONNECTION_H
-#define FRIEND_CONNECTION_H
+#ifndef C_TOXCORE_TOXCORE_FRIEND_CONNECTION_H
+#define C_TOXCORE_TOXCORE_FRIEND_CONNECTION_H
 
 #include "DHT.h"
 #include "LAN_discovery.h"
diff --git a/toxcore/friend_requests.h b/toxcore/friend_requests.h
index f8b3718c..7fcd3f0d 100644
--- a/toxcore/friend_requests.h
+++ b/toxcore/friend_requests.h
@@ -21,8 +21,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef FRIEND_REQUESTS_H
-#define FRIEND_REQUESTS_H
+#ifndef C_TOXCORE_TOXCORE_FRIEND_REQUESTS_H
+#define C_TOXCORE_TOXCORE_FRIEND_REQUESTS_H
 
 #include "friend_connection.h"
 
diff --git a/toxcore/group.h b/toxcore/group.h
index 110f5d44..7acd4637 100644
--- a/toxcore/group.h
+++ b/toxcore/group.h
@@ -21,8 +21,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef GROUP_H
-#define GROUP_H
+#ifndef C_TOXCORE_TOXCORE_GROUP_H
+#define C_TOXCORE_TOXCORE_GROUP_H
 
 #include "Messenger.h"
 
diff --git a/toxcore/list.h b/toxcore/list.h
index 6ec67505..c9c72c2a 100644
--- a/toxcore/list.h
+++ b/toxcore/list.h
@@ -23,8 +23,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef LIST_H
-#define LIST_H
+#ifndef C_TOXCORE_TOXCORE_LIST_H
+#define C_TOXCORE_TOXCORE_LIST_H
 
 #include <stdint.h>
 
diff --git a/toxcore/logger.h b/toxcore/logger.h
index aaca7612..6231ca4b 100644
--- a/toxcore/logger.h
+++ b/toxcore/logger.h
@@ -21,8 +21,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef TOXLOGGER_H
-#define TOXLOGGER_H
+#ifndef C_TOXCORE_TOXCORE_LOGGER_H
+#define C_TOXCORE_TOXCORE_LOGGER_H
 
 #include <stdint.h>
 
@@ -90,4 +90,4 @@ void logger_write(
 #define LOGGER_WARNING(log, ...) LOGGER_WRITE(log, LOGGER_LEVEL_WARNING, __VA_ARGS__)
 #define LOGGER_ERROR(log, ...)   LOGGER_WRITE(log, LOGGER_LEVEL_ERROR  , __VA_ARGS__)
 
-#endif /* TOXLOGGER_H */
+#endif // C_TOXCORE_TOXCORE_LOGGER_H
diff --git a/toxcore/mono_time.h b/toxcore/mono_time.h
index c2934d06..503548f2 100644
--- a/toxcore/mono_time.h
+++ b/toxcore/mono_time.h
@@ -66,4 +66,4 @@ void mono_time_set_current_time_callback(Mono_Time *mono_time,
 }
 #endif
 
-#endif  // C_TOXCORE_TOXCORE_MONO_TIME_H
+#endif // C_TOXCORE_TOXCORE_MONO_TIME_H
diff --git a/toxcore/net_crypto.h b/toxcore/net_crypto.h
index 9fd47014..45e1a05e 100644
--- a/toxcore/net_crypto.h
+++ b/toxcore/net_crypto.h
@@ -21,8 +21,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef NET_CRYPTO_H
-#define NET_CRYPTO_H
+#ifndef C_TOXCORE_TOXCORE_NET_CRYPTO_H
+#define C_TOXCORE_TOXCORE_NET_CRYPTO_H
 
 #include "DHT.h"
 #include "LAN_discovery.h"
diff --git a/toxcore/network.h b/toxcore/network.h
index 6c5b6781..a1d83842 100644
--- a/toxcore/network.h
+++ b/toxcore/network.h
@@ -21,8 +21,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef NETWORK_H
-#define NETWORK_H
+#ifndef C_TOXCORE_TOXCORE_NETWORK_H
+#define C_TOXCORE_TOXCORE_NETWORK_H
 
 #include "logger.h"
 
diff --git a/toxcore/onion.h b/toxcore/onion.h
index c48d6566..26cf0039 100644
--- a/toxcore/onion.h
+++ b/toxcore/onion.h
@@ -21,8 +21,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef ONION_H
-#define ONION_H
+#ifndef C_TOXCORE_TOXCORE_ONION_H
+#define C_TOXCORE_TOXCORE_ONION_H
 
 #include "DHT.h"
 #include "mono_time.h"
diff --git a/toxcore/onion_announce.h b/toxcore/onion_announce.h
index adbffc6a..2eb5051b 100644
--- a/toxcore/onion_announce.h
+++ b/toxcore/onion_announce.h
@@ -21,8 +21,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef ONION_ANNOUNCE_H
-#define ONION_ANNOUNCE_H
+#ifndef C_TOXCORE_TOXCORE_ONION_ANNOUNCE_H
+#define C_TOXCORE_TOXCORE_ONION_ANNOUNCE_H
 
 #include "onion.h"
 
diff --git a/toxcore/onion_client.h b/toxcore/onion_client.h
index ff090ba2..66e417d7 100644
--- a/toxcore/onion_client.h
+++ b/toxcore/onion_client.h
@@ -22,8 +22,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef ONION_CLIENT_H
-#define ONION_CLIENT_H
+#ifndef C_TOXCORE_TOXCORE_ONION_CLIENT_H
+#define C_TOXCORE_TOXCORE_ONION_CLIENT_H
 
 #include "net_crypto.h"
 #include "onion_announce.h"
diff --git a/toxcore/ping.api.h b/toxcore/ping.api.h
index 9f8d319c..2ae5b365 100644
--- a/toxcore/ping.api.h
+++ b/toxcore/ping.api.h
@@ -24,8 +24,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef PING_H
-#define PING_H
+#ifndef C_TOXCORE_TOXCORE_PING_H
+#define C_TOXCORE_TOXCORE_PING_H
 
 #include "DHT.h"
 #include "network.h"
@@ -62,5 +62,5 @@ int32_t send_request(iP_Port::this ipp, const uint8_t *public_key);
 }
 
 %{
-#endif /* PING_H */
+#endif // C_TOXCORE_TOXCORE_PING_H
 %}
diff --git a/toxcore/ping.h b/toxcore/ping.h
index da9a53f2..0413e285 100644
--- a/toxcore/ping.h
+++ b/toxcore/ping.h
@@ -23,8 +23,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef PING_H
-#define PING_H
+#ifndef C_TOXCORE_TOXCORE_PING_H
+#define C_TOXCORE_TOXCORE_PING_H
 
 #include "DHT.h"
 #include "network.h"
@@ -71,4 +71,4 @@ void ping_iterate(Ping *ping);
 
 int32_t ping_send_request(Ping *ping, struct IP_Port ipp, const uint8_t *public_key);
 
-#endif /* PING_H */
+#endif // C_TOXCORE_TOXCORE_PING_H
diff --git a/toxcore/ping_array.api.h b/toxcore/ping_array.api.h
index b153db25..e0ac333b 100644
--- a/toxcore/ping_array.api.h
+++ b/toxcore/ping_array.api.h
@@ -77,5 +77,5 @@ int32_t check(const mono_Time::this *mono_time, uint8_t[length] data, uint64_t p
 }  // extern "C"
 #endif
 
-#endif  // C_TOXCORE_TOXCORE_PING_ARRAY_H
+#endif // C_TOXCORE_TOXCORE_PING_ARRAY_H
 %}
diff --git a/toxcore/ping_array.h b/toxcore/ping_array.h
index 90e10460..a2e57856 100644
--- a/toxcore/ping_array.h
+++ b/toxcore/ping_array.h
@@ -78,4 +78,4 @@ int32_t ping_array_check(struct Ping_Array *_array, const struct Mono_Time *mono
 }  // extern "C"
 #endif
 
-#endif  // C_TOXCORE_TOXCORE_PING_ARRAY_H
+#endif // C_TOXCORE_TOXCORE_PING_ARRAY_H
diff --git a/toxcore/tox.api.h b/toxcore/tox.api.h
index d960ee74..8beb86b7 100644
--- a/toxcore/tox.api.h
+++ b/toxcore/tox.api.h
@@ -22,8 +22,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef TOX_H
-#define TOX_H
+#ifndef C_TOXCORE_TOXCORE_TOX_H
+#define C_TOXCORE_TOXCORE_TOX_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -2772,5 +2772,5 @@ typedef TOX_CONNECTION Tox_Connection;
 typedef TOX_FILE_CONTROL Tox_File_Control;
 typedef TOX_CONFERENCE_TYPE Tox_Conference_Type;
 
-#endif
+#endif // C_TOXCORE_TOXCORE_TOX_H
 %}
diff --git a/toxcore/tox.h b/toxcore/tox.h
index 5dcdd7f0..5a9ca450 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -21,8 +21,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef TOX_H
-#define TOX_H
+#ifndef C_TOXCORE_TOXCORE_TOX_H
+#define C_TOXCORE_TOXCORE_TOX_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -3167,4 +3167,4 @@ typedef TOX_CONNECTION Tox_Connection;
 typedef TOX_FILE_CONTROL Tox_File_Control;
 typedef TOX_CONFERENCE_TYPE Tox_Conference_Type;
 
-#endif
+#endif // C_TOXCORE_TOXCORE_TOX_H
diff --git a/toxcore/util.h b/toxcore/util.h
index b4ba407d..85586724 100644
--- a/toxcore/util.h
+++ b/toxcore/util.h
@@ -23,8 +23,8 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef UTIL_H
-#define UTIL_H
+#ifndef C_TOXCORE_TOXCORE_UTIL_H
+#define C_TOXCORE_TOXCORE_UTIL_H
 
 #include <pthread.h>
 #include <stdbool.h>
@@ -55,4 +55,4 @@ uint64_t min_u64(uint64_t a, uint64_t b);
 }  // extern "C"
 #endif
 
-#endif /* UTIL_H */
+#endif // C_TOXCORE_TOXCORE_UTIL_H