[naviserver-commits] naviserver/nsd binder.c,1.10,1.11 driver.c,1.16,1.17

[Stephen D. <sd...@us...>]

Update of /cvsroot/naviserver/naviserver/nsd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22617/nsd

Modified Files:
	binder.c driver.c 
Log Message:
Localize Windows ifdefs as much as possible.


Index: driver.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/driver.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** driver.c	6 Jul 2005 07:12:17 -0000	1.16
--- driver.c	6 Jul 2005 08:35:08 -0000	1.17
***************
*** 448,455 ****
          if (drvPtr->opts & NS_DRIVER_UDP) {
              drvPtr->sock = Ns_SockListenUdp(drvPtr->bindaddr, drvPtr->port);
- #ifndef _WIN32
          } else if (drvPtr->opts & NS_DRIVER_UNIX) {
              drvPtr->sock = Ns_SockListenUnix(drvPtr->bindaddr);
- #endif
          } else {
              drvPtr->sock = Ns_SockListenEx(drvPtr->bindaddr, drvPtr->port,
--- 448,453 ----

Index: binder.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/binder.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** binder.c	24 Jun 2005 08:36:29 -0000	1.10
--- binder.c	6 Jul 2005 08:35:07 -0000	1.11
***************
*** 53,57 ****
  static Ns_Mutex lock;
  
! #ifndef _WIN32
  static void PreBind(char *line);
  
--- 53,60 ----
  static Ns_Mutex lock;
  
! /*
!  * Local functions defined in this file
!  */
! 
  static void PreBind(char *line);
  
***************
*** 105,109 ****
      return (SOCKET)sock;
  }
! #endif /* _WIN32 */
  
  /*
--- 108,112 ----
      return (SOCKET)sock;
  }
! 
  
  /*
***************
*** 191,195 ****
  
  
- #ifndef _WIN32
  /*
   *----------------------------------------------------------------------
--- 194,197 ----
***************
*** 215,218 ****
--- 217,221 ----
      Tcl_HashSearch search;
  
+ #ifndef _WIN32
      Ns_MutexLock(&lock);
      hPtr = Tcl_FirstHashEntry(&preboundUnix, &search);
***************
*** 238,244 ****
          Ns_SetSockErrno(err);
      }
!     return (SOCKET)sock;
  }
! #endif /* _WIN32 */
  
  /*
--- 241,249 ----
          Ns_SetSockErrno(err);
      }
! #endif
! 
!     return (SOCKET) sock;
  }
! 
  
  /*
***************
*** 278,282 ****
  
  
- #ifndef _WIN32
  /*
   *----------------------------------------------------------------------
--- 283,286 ----
***************
*** 301,305 ****
      int sock = -1;
      struct sockaddr_un addr;
!     
      memset(&addr, 0, sizeof(addr));
      addr.sun_family = AF_UNIX;
--- 305,310 ----
      int sock = -1;
      struct sockaddr_un addr;
! 
! #ifndef _WIN32    
      memset(&addr, 0, sizeof(addr));
      addr.sun_family = AF_UNIX;
***************
*** 316,323 ****
          Ns_SetSockErrno(err);
      }
      
!     return (SOCKET)sock;
  }
! #endif /* _WIN32 */
  
  /*
--- 321,329 ----
          Ns_SetSockErrno(err);
      }
+ #endif
      
!     return (SOCKET) sock;
  }
! 
  
  /*
***************
*** 381,386 ****
  }
  
- #ifndef _WIN32
- 
  
  /*
--- 387,390 ----
***************
*** 403,406 ****
--- 407,411 ----
  NsPreBind(char *args, char *file)
  {
+ #ifndef _WIN32
      if (args != NULL) {
          PreBind(args);
***************
*** 417,420 ****
--- 422,426 ----
          }
      }
+ #endif
  }
  
***************
*** 439,442 ****
--- 445,451 ----
  NsClosePreBound(void)
  {
+ #ifdef _WIN32
+     return;
+ #else
      Tcl_HashEntry *hPtr;
      Tcl_HashSearch search;
***************
*** 520,523 ****
--- 529,533 ----
  
      Ns_MutexUnlock(&lock);
+ #endif
  }
  
***************
*** 548,551 ****
--- 558,564 ----
  PreBind(char *line)
  {
+ #ifdef _WIN32
+     return;
+ #else
      Tcl_HashEntry *hPtr;
      int new, sock, port;
***************
*** 663,667 ****
          }
      }
  }
- 
- #endif /* _WIN32 */
--- 676,679 ----
          }
      }
+ #endif
  }