diff --git a/kermit/k95/ckuus3.c b/kermit/k95/ckuus3.c index c4c6308f..5ecce467 100644 --- a/kermit/k95/ckuus3.c +++ b/kermit/k95/ckuus3.c @@ -4140,7 +4140,7 @@ dosexp(s) char *s; } goto xdosexp; } else if (x == SX_IFC) { /* Conditional expression */ - int true = 0; + int bool_result = 0; if (n > 4) { printf("?Too many operands: IF - \"%s\"\n",s); sexprc++; @@ -4157,12 +4157,12 @@ dosexp(s) char *s; } else { fpj = atof(s2); } - true = ((fpj != 0.0) ? 1 : 0); + bool_result = ((fpj != 0.0) ? 1 : 0); } - if (!true && n < 4) { + if (!bool_result && n < 4) { s2 = NULL; } else { - s2 = dosexp(true ? p[3] : p[4]); + s2 = dosexp(bool_result ? p[3] : p[4]); if (sexprc) goto xdosexp; j = s2 ? ckatofs(s2) : 0; if (xxfloat(s2,0) == 2) { diff --git a/kermit/p95/pdll_socket.h b/kermit/p95/pdll_socket.h index caf86fda..9e728e4a 100644 --- a/kermit/p95/pdll_socket.h +++ b/kermit/p95/pdll_socket.h @@ -45,7 +45,7 @@ _Inline void tcp_open(void) { - U32 true = 1; + U32 true_u32 = 1; struct hostent *hostnm; /* server host name information */ struct sockaddr_in server; /* server address information */ #ifdef NT @@ -68,7 +68,7 @@ _Inline void tcp_open(void) { MODULE_SOCKET, __LINE__, 0); if (setsockopt(passive_socket, SOL_SOCKET, SO_REUSEADDR, - (char *)&true, sizeof(true))) + (char *)&true_u32, sizeof(true_u32))) p_error(P_ERROR_SETSOCKOPT, sock_errno(), MODULE_SOCKET, __LINE__, passive_socket); @@ -87,9 +87,9 @@ _Inline void tcp_open(void) { /***********************************************/ if ( #ifdef NT -ioctlsocket( passive_socket, FIONBIO, &true ) +ioctlsocket( passive_socket, FIONBIO, &true_u32 ) #else -ioctl(passive_socket, FIONBIO, (char *)&true, sizeof(U32)) +ioctl(passive_socket, FIONBIO, (char *)&true_u32, sizeof(true_u32)) #endif ) p_error(P_ERROR_IOCTL, sock_errno(), @@ -119,9 +119,9 @@ ioctl(passive_socket, FIONBIO, (char *)&true, sizeof(U32)) MODULE_SOCKET, __LINE__, socket_handle); if ( #ifdef NT -ioctlsocket( socket_handle, FIONBIO, &true ) +ioctlsocket( socket_handle, FIONBIO, &true_u32 ) #else -ioctl(socket_handle, FIONBIO, (char *)&true, sizeof(U32)) +ioctl(socket_handle, FIONBIO, (char *)&true_u32, sizeof(true_u32)) #endif ) p_error(P_ERROR_IOCTL, sock_errno(), @@ -134,7 +134,7 @@ ioctl(socket_handle, FIONBIO, (char *)&true, sizeof(U32)) _Inline U32 tcp_connect(void) { U32 namelen; - U32 true = 1; + U32 true_u32 = 1; struct hostent *hostnm; /* client host name information */ struct sockaddr_in client; /* client address information */ @@ -169,9 +169,9 @@ _Inline U32 tcp_connect(void) { if ( #ifdef NT -ioctlsocket( socket_handle, FIONBIO, &true ) +ioctlsocket( socket_handle, FIONBIO, &true_u32 ) #else -ioctl(socket_handle, FIONBIO, (char *)&true, sizeof(U32)) +ioctl(socket_handle, FIONBIO, (char *)&true_u32, sizeof(true_u32)) #endif ) p_error(P_ERROR_IOCTL, sock_errno(),