summaryrefslogtreecommitdiff
path: root/toxcore
diff options
context:
space:
mode:
authorendoffile78 <endoffile78@yahoo.com>2017-01-05 15:16:56 -0600
committerendoffile78 <endoffile78@yahoo.com>2017-01-05 15:16:56 -0600
commit59e2a844f04a8725e8079f854158aa86ef5988b2 (patch)
tree40130a9f28a5d08b6ff524156f5476b7359f75df /toxcore
parent0a61d1108547513211560e66809479cab5082ede (diff)
Revert "Portability fixes"
This reverts commit f3469070fe899e8e4fd88665386a55bad9f77cd8.
Diffstat (limited to 'toxcore')
-rw-r--r--toxcore/TCP_server.c4
-rw-r--r--toxcore/network.c2
-rw-r--r--toxcore/tox.c2
-rw-r--r--toxcore/util.c2
4 files changed, 2 insertions, 8 deletions
diff --git a/toxcore/TCP_server.c b/toxcore/TCP_server.c
index d9ace28a..0e2d0085 100644
--- a/toxcore/TCP_server.c
+++ b/toxcore/TCP_server.c
@@ -619,7 +619,7 @@ static int send_routing_response(TCP_Secure_Connection *con, uint8_t rpid, const
619 */ 619 */
620static int send_connect_notification(TCP_Secure_Connection *con, uint8_t id) 620static int send_connect_notification(TCP_Secure_Connection *con, uint8_t id)
621{ 621{
622 uint8_t data[2] = {TCP_PACKET_CONNECTION_NOTIFICATION, (uint8_t)(id + NUM_RESERVED_PORTS)}; 622 uint8_t data[2] = {TCP_PACKET_CONNECTION_NOTIFICATION, id + NUM_RESERVED_PORTS};
623 return write_packet_TCP_secure_connection(con, data, sizeof(data), 1); 623 return write_packet_TCP_secure_connection(con, data, sizeof(data), 1);
624} 624}
625 625
@@ -629,7 +629,7 @@ static int send_connect_notification(TCP_Secure_Connection *con, uint8_t id)
629 */ 629 */
630static int send_disconnect_notification(TCP_Secure_Connection *con, uint8_t id) 630static int send_disconnect_notification(TCP_Secure_Connection *con, uint8_t id)
631{ 631{
632 uint8_t data[2] = {TCP_PACKET_DISCONNECT_NOTIFICATION, (uint8_t)(id + NUM_RESERVED_PORTS)}; 632 uint8_t data[2] = {TCP_PACKET_DISCONNECT_NOTIFICATION, id + NUM_RESERVED_PORTS};
633 return write_packet_TCP_secure_connection(con, data, sizeof(data), 1); 633 return write_packet_TCP_secure_connection(con, data, sizeof(data), 1);
634} 634}
635 635
diff --git a/toxcore/network.c b/toxcore/network.c
index 250a304b..31e8fd8b 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -21,8 +21,6 @@
21 * 21 *
22 */ 22 */
23 23
24#define _XOPEN_SOURCE 600
25
26#if defined(_WIN32) && _WIN32_WINNT >= _WIN32_WINNT_WINXP 24#if defined(_WIN32) && _WIN32_WINNT >= _WIN32_WINNT_WINXP
27#define _WIN32_WINNT 0x501 25#define _WIN32_WINNT 0x501
28#endif 26#endif
diff --git a/toxcore/tox.c b/toxcore/tox.c
index 3276d2d5..37298ce2 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -21,8 +21,6 @@
21 * 21 *
22 */ 22 */
23 23
24#define _XOPEN_SOURCE 600
25
26#ifdef HAVE_CONFIG_H 24#ifdef HAVE_CONFIG_H
27#include "config.h" 25#include "config.h"
28#endif 26#endif
diff --git a/toxcore/util.c b/toxcore/util.c
index 1d2a85dc..7a390ea9 100644
--- a/toxcore/util.c
+++ b/toxcore/util.c
@@ -22,8 +22,6 @@
22 * along with Tox. If not, see <http://www.gnu.org/licenses/>. 22 * along with Tox. If not, see <http://www.gnu.org/licenses/>.
23 */ 23 */
24 24
25#define _XOPEN_SOURCE 600
26
27#ifdef HAVE_CONFIG_H 25#ifdef HAVE_CONFIG_H
28#include "config.h" 26#include "config.h"
29#endif 27#endif