summaryrefslogtreecommitdiff
path: root/src/lib/ecore_ipc
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2019-02-01 11:04:17 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-02-01 14:25:35 +0000
commitf7c560c311d0ba0da94346e17c8b20f40a0ed152 (patch)
treeaf5f63aceb78ff1b153f3727f8adab6ee4e1d653 /src/lib/ecore_ipc
parent36286a23fe97e3667c1106116d1edbc301c7a9ba (diff)
replace hton and ntoh family functions with ones defined in eina
Summary: This fixes especially the execution of edje_cc on Windows Test Plan: execution of edje_cc Reviewers: cedric, raster Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D7834
Diffstat (limited to 'src/lib/ecore_ipc')
-rw-r--r--src/lib/ecore_ipc/ecore_ipc.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/ecore_ipc/ecore_ipc.c b/src/lib/ecore_ipc/ecore_ipc.c
index babf033a17..094e95aed1 100644
--- a/src/lib/ecore_ipc/ecore_ipc.c
+++ b/src/lib/ecore_ipc/ecore_ipc.c
@@ -886,7 +886,7 @@ ecore_ipc_server_clients_get(Ecore_Ipc_Server *svr)
886 unsigned char *dd; \ 886 unsigned char *dd; \
887 dd = (unsigned char *)&v; \ 887 dd = (unsigned char *)&v; \
888 v = d; \ 888 v = d; \
889 v = htonl(v); \ 889 v = eina_htonl(v); \
890 *(dat + s + 0) = dd[0]; \ 890 *(dat + s + 0) = dd[0]; \
891 *(dat + s + 1) = dd[1]; \ 891 *(dat + s + 1) = dd[1]; \
892 *(dat + s + 2) = dd[2]; \ 892 *(dat + s + 2) = dd[2]; \
@@ -899,7 +899,7 @@ ecore_ipc_server_clients_get(Ecore_Ipc_Server *svr)
899 unsigned char *dd; \ 899 unsigned char *dd; \
900 dd = (unsigned char *)&v; \ 900 dd = (unsigned char *)&v; \
901 v = d; \ 901 v = d; \
902 v = htons(v); \ 902 v = eina_htons(v); \
903 *(dat + s + 0) = dd[0]; \ 903 *(dat + s + 0) = dd[0]; \
904 *(dat + s + 1) = dd[1]; \ 904 *(dat + s + 1) = dd[1]; \
905 s += 2; \ 905 s += 2; \
@@ -945,7 +945,7 @@ ecore_ipc_server_send(Ecore_Ipc_Server *svr, int major, int minor, int ref, int
945 *head |= md << (4 * 4); 945 *head |= md << (4 * 4);
946 SVENC(size); 946 SVENC(size);
947 *head |= md << (4 * 5); 947 *head |= md << (4 * 5);
948 *head = htonl(*head); 948 *head = eina_htonl(*head);
949 svr->prev.o = msg; 949 svr->prev.o = msg;
950 950
951 if (svr->dialer.input) 951 if (svr->dialer.input)
@@ -1101,7 +1101,7 @@ ecore_ipc_server_flush(Ecore_Ipc_Server *svr)
1101 unsigned char *dd; \ 1101 unsigned char *dd; \
1102 dd = (unsigned char *)&v; \ 1102 dd = (unsigned char *)&v; \
1103 v = d; \ 1103 v = d; \
1104 v = htonl(v); \ 1104 v = eina_htonl(v); \
1105 *(dat + s + 0) = dd[0]; \ 1105 *(dat + s + 0) = dd[0]; \
1106 *(dat + s + 1) = dd[1]; \ 1106 *(dat + s + 1) = dd[1]; \
1107 *(dat + s + 2) = dd[2]; \ 1107 *(dat + s + 2) = dd[2]; \
@@ -1114,7 +1114,7 @@ ecore_ipc_server_flush(Ecore_Ipc_Server *svr)
1114 unsigned char *dd; \ 1114 unsigned char *dd; \
1115 dd = (unsigned char *)&v; \ 1115 dd = (unsigned char *)&v; \
1116 v = d; \ 1116 v = d; \
1117 v = htons(v); \ 1117 v = eina_htons(v); \
1118 *(dat + s + 0) = dd[0]; \ 1118 *(dat + s + 0) = dd[0]; \
1119 *(dat + s + 1) = dd[1]; \ 1119 *(dat + s + 1) = dd[1]; \
1120 s += 2; \ 1120 s += 2; \
@@ -1168,7 +1168,7 @@ ecore_ipc_client_send(Ecore_Ipc_Client *cl, int major, int minor, int ref, int r
1168 *head |= md << (4 * 4); 1168 *head |= md << (4 * 4);
1169 CLENC(size); 1169 CLENC(size);
1170 *head |= md << (4 * 5); 1170 *head |= md << (4 * 5);
1171 *head = htonl(*head); 1171 *head = eina_htonl(*head);
1172 cl->prev.o = msg; 1172 cl->prev.o = msg;
1173 1173
1174 if (cl->socket.input) 1174 if (cl->socket.input)
@@ -1503,7 +1503,7 @@ ecore_ipc_ssl_available_get(void)
1503 dv[1] = *(cl->buf + offset + s + 1); \ 1503 dv[1] = *(cl->buf + offset + s + 1); \
1504 dv[2] = *(cl->buf + offset + s + 2); \ 1504 dv[2] = *(cl->buf + offset + s + 2); \
1505 dv[3] = *(cl->buf + offset + s + 3); \ 1505 dv[3] = *(cl->buf + offset + s + 3); \
1506 d = (int)ntohl(v); \ 1506 d = (int)eina_ntohl(v); \
1507 s += 4; \ 1507 s += 4; \
1508 } \ 1508 } \
1509 else if (md >= DLT_ADD16) \ 1509 else if (md >= DLT_ADD16) \
@@ -1513,7 +1513,7 @@ ecore_ipc_ssl_available_get(void)
1513 dv = (unsigned char *)&v; \ 1513 dv = (unsigned char *)&v; \
1514 dv[0] = *(cl->buf + offset + s + 0); \ 1514 dv[0] = *(cl->buf + offset + s + 0); \
1515 dv[1] = *(cl->buf + offset + s + 1); \ 1515 dv[1] = *(cl->buf + offset + s + 1); \
1516 d = (int)ntohs(v); \ 1516 d = (int)eina_ntohs(v); \
1517 s += 2; \ 1517 s += 2; \
1518 } \ 1518 } \
1519 else if (md >= DLT_ADD8) \ 1519 else if (md >= DLT_ADD8) \
@@ -1572,7 +1572,7 @@ ecore_ipc_client_data_process(Ecore_Ipc_Client *cl, void *data, int size, Eina_B
1572 dd[1] = *(cl->buf + offset + 1); 1572 dd[1] = *(cl->buf + offset + 1);
1573 dd[2] = *(cl->buf + offset + 2); 1573 dd[2] = *(cl->buf + offset + 2);
1574 dd[3] = *(cl->buf + offset + 3); 1574 dd[3] = *(cl->buf + offset + 3);
1575 head = ntohl(head); 1575 head = eina_ntohl(head);
1576 dd = (unsigned char *)&d; 1576 dd = (unsigned char *)&d;
1577 s = 4; 1577 s = 4;
1578 CLSZ(0); 1578 CLSZ(0);
@@ -1695,7 +1695,7 @@ ecore_ipc_client_data_process(Ecore_Ipc_Client *cl, void *data, int size, Eina_B
1695 dv[1] = *(svr->buf + offset + s + 1); \ 1695 dv[1] = *(svr->buf + offset + s + 1); \
1696 dv[2] = *(svr->buf + offset + s + 2); \ 1696 dv[2] = *(svr->buf + offset + s + 2); \
1697 dv[3] = *(svr->buf + offset + s + 3); \ 1697 dv[3] = *(svr->buf + offset + s + 3); \
1698 d = (int)ntohl(v); \ 1698 d = (int)eina_ntohl(v); \
1699 s += 4; \ 1699 s += 4; \
1700 } \ 1700 } \
1701 else if (md >= DLT_ADD16) \ 1701 else if (md >= DLT_ADD16) \
@@ -1705,7 +1705,7 @@ ecore_ipc_client_data_process(Ecore_Ipc_Client *cl, void *data, int size, Eina_B
1705 dv = (unsigned char *)&v; \ 1705 dv = (unsigned char *)&v; \
1706 dv[0] = *(svr->buf + offset + s + 0); \ 1706 dv[0] = *(svr->buf + offset + s + 0); \
1707 dv[1] = *(svr->buf + offset + s + 1); \ 1707 dv[1] = *(svr->buf + offset + s + 1); \
1708 d = (int)ntohs(v); \ 1708 d = (int)eina_ntohs(v); \
1709 s += 2; \ 1709 s += 2; \
1710 } \ 1710 } \
1711 else if (md >= DLT_ADD8) \ 1711 else if (md >= DLT_ADD8) \
@@ -1763,7 +1763,7 @@ ecore_ipc_server_data_process(Ecore_Ipc_Server *svr, void *data, int size, Eina_
1763 dd[1] = *(svr->buf + offset + 1); 1763 dd[1] = *(svr->buf + offset + 1);
1764 dd[2] = *(svr->buf + offset + 2); 1764 dd[2] = *(svr->buf + offset + 2);
1765 dd[3] = *(svr->buf + offset + 3); 1765 dd[3] = *(svr->buf + offset + 3);
1766 head = ntohl(head); 1766 head = eina_ntohl(head);
1767 dd = (unsigned char *)&d; 1767 dd = (unsigned char *)&d;
1768 s = 4; 1768 s = 4;
1769 SVSZ(0); 1769 SVSZ(0);