diff options
author | irungentoo <irungentoo@gmail.com> | 2013-07-26 05:38:35 -0700 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2013-07-26 05:38:35 -0700 |
commit | 8c70b7c11d6d5acc08e234554f187b18876fd5d3 (patch) | |
tree | 8ef350879553acd22c20887016f4249815ab1d0f /core/network.h | |
parent | 63375b68b63d33c8437f313b2041b559c32c945b (diff) | |
parent | 1577a1eb61b6e2839aec962025d78e8703be3661 (diff) |
Merge pull request #103 from SilentSand/master
Licensing
Diffstat (limited to 'core/network.h')
-rw-r--r-- | core/network.h | 47 |
1 files changed, 21 insertions, 26 deletions
diff --git a/core/network.h b/core/network.h index 62169d88..dcbd4160 100644 --- a/core/network.h +++ b/core/network.h | |||
@@ -1,27 +1,25 @@ | |||
1 | /* network.h | 1 | /* network.h |
2 | * | 2 | * |
3 | * Datatypes, functions and includes for the core networking. | 3 | * Datatypes, functions and includes for the core networking. |
4 | * | 4 | * |
5 | 5 | * Copyright (C) 2013 Tox project All Rights Reserved. | |
6 | Copyright (C) 2013 Tox project All Rights Reserved. | 6 | * |
7 | 7 | * This file is part of Tox. | |
8 | This file is part of Tox. | 8 | * |
9 | 9 | * Tox is free software: you can redistribute it and/or modify | |
10 | Tox is free software: you can redistribute it and/or modify | 10 | * it under the terms of the GNU General Public License as published by |
11 | it under the terms of the GNU General Public License as published by | 11 | * the Free Software Foundation, either version 3 of the License, or |
12 | the Free Software Foundation, either version 3 of the License, or | 12 | * (at your option) any later version. |
13 | (at your option) any later version. | 13 | * |
14 | 14 | * Tox is distributed in the hope that it will be useful, | |
15 | Tox is distributed in the hope that it will be useful, | 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
16 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
17 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 17 | * GNU General Public License for more details. |
18 | GNU General Public License for more details. | 18 | * |
19 | 19 | * You should have received a copy of the GNU General Public License | |
20 | You should have received a copy of the GNU General Public License | 20 | * along with Tox. If not, see <http://www.gnu.org/licenses/>. |
21 | along with Tox. If not, see <http://www.gnu.org/licenses/>. | 21 | * |
22 | 22 | */ | |
23 | */ | ||
24 | |||
25 | 23 | ||
26 | #ifndef NETWORK_H | 24 | #ifndef NETWORK_H |
27 | #define NETWORK_H | 25 | #define NETWORK_H |
@@ -32,8 +30,6 @@ | |||
32 | #include <string.h> | 30 | #include <string.h> |
33 | #include <time.h> | 31 | #include <time.h> |
34 | 32 | ||
35 | |||
36 | |||
37 | #ifdef WIN32 /* Put win32 includes here */ | 33 | #ifdef WIN32 /* Put win32 includes here */ |
38 | //Windows XP | 34 | //Windows XP |
39 | #define WINVER 0x0501 | 35 | #define WINVER 0x0501 |
@@ -98,7 +94,6 @@ typedef struct | |||
98 | #endif | 94 | #endif |
99 | }ADDR; | 95 | }ADDR; |
100 | 96 | ||
101 | |||
102 | /* returns current time in milleseconds since the epoch. */ | 97 | /* returns current time in milleseconds since the epoch. */ |
103 | uint64_t current_time(); | 98 | uint64_t current_time(); |
104 | 99 | ||