-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.13 2001/07/15 13:56:57 jongfoster Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.17 2001/09/13 20:11:46 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
*
* Revisions :
* $Log: jbsockets.c,v $
+ * Revision 1.17 2001/09/13 20:11:46 jongfoster
+ * Fixing 2 compiler warnings under Win32
+ *
+ * Revision 1.16 2001/07/30 22:08:36 jongfoster
+ * Tidying up #defines:
+ * - All feature #defines are now of the form FEATURE_xxx
+ * - Permanently turned off WIN_GUI_EDIT
+ * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS
+ *
+ * Revision 1.15 2001/07/29 17:40:43 jongfoster
+ * Fixed compiler warning by adding a cast
+ *
+ * Revision 1.14 2001/07/18 13:47:59 oes
+ * Eliminated dirty hack for getsockbyname()
+ *
* Revision 1.13 2001/07/15 13:56:57 jongfoster
* Removing unused local variable.
*
#include <socket.h>
#endif
+#ifdef __EMX__
+#include <sys/select.h> /* OS/2/EMX needs a little help with select */
+#endif
+
#endif
#include "project.h"
int flags;
#endif /* !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) */
-#ifdef ACL_FILES
+#ifdef FEATURE_ACL
struct access_control_addr dst[1];
-#endif /* def ACL_FILES */
+#endif /* def FEATURE_ACL */
memset((char *)&inaddr, 0, sizeof inaddr);
return(-1);
}
-#ifdef ACL_FILES
+#ifdef FEATURE_ACL
dst->addr = ntohl(addr);
dst->port = portnum;
errno = EPERM;
return(-1);
}
-#endif /* def ACL_FILES */
+#endif /* def FEATURE_ACL */
inaddr.sin_addr.s_addr = addr;
inaddr.sin_family = AF_INET;
csp->http->host_ip_addr_str = strdup(inet_ntoa(inaddr.sin_addr));
+#ifndef _WIN32
if (sizeof(inaddr.sin_port) == sizeof(short))
+#endif /* ndef _WIN32 */
{
inaddr.sin_port = htons((short)portnum);
}
+#ifndef _WIN32
else
{
inaddr.sin_port = htonl(portnum);
}
+#endif /* ndef _WIN32 */
if ((fd = socket(inaddr.sin_family, SOCK_STREAM, 0)) < 0)
{
inaddr.sin_family = AF_INET;
inaddr.sin_addr.s_addr = resolve_hostname_to_ip(hostnam);
+#ifndef _WIN32
if (sizeof(inaddr.sin_port) == sizeof(short))
+#endif /* ndef _WIN32 */
{
inaddr.sin_port = htons((short)portnum);
}
+#ifndef _WIN32
else
{
inaddr.sin_port = htonl(portnum);
}
+#endif /* ndef _WIN32 */
fd = socket(AF_INET, SOCK_STREAM, 0);
{
csp->my_ip_addr_str = strdup(inet_ntoa(server.sin_addr));
- host = gethostbyaddr(&server.sin_addr, sizeof(server.sin_addr), AF_INET);
+ host = gethostbyaddr((const char *)&server.sin_addr,
+ sizeof(server.sin_addr), AF_INET);
if (host == NULL)
{
log_error(LOG_LEVEL_ERROR, "Unable to get my own hostname: %E\n");