Sfoglia il codice sorgente

* Ported [2909] to 1.2.11
* CYGWIN compile fixes


svn: 2910

Bryan Drewery 20 anni fa
parent
commit
492b0b2224
2 ha cambiato i file con 4 aggiunte e 0 eliminazioni
  1. 2 0
      src/dccutil.c
  2. 2 0
      src/shell.c

+ 2 - 0
src/dccutil.c

@@ -883,7 +883,9 @@ listen_all(port_t lport, bool off)
       i = open_listen(&port);
 #endif /* USE_IPV6 */
       if (i < 0) {
+#ifdef USE_IPV6
         if (i6 < 0)
+#endif /* USE_IPV6 */
           putlog(LOG_ERRORS, "*", "Can't open IPv4 listening port %d - %s", port,
                  i == -1 ? "it's taken." : "couldn't assign ip.");
       } else {

+ 2 - 0
src/shell.c

@@ -588,7 +588,9 @@ void suicide(const char *msg)
   //Not recursively clearing these dirs as they may be ~USER/ ..
   unlink(conf.datadir); //Probably will fail, shrug
   unlink(tempdir); //Probably will fail too, oh well
+#ifndef CYGWIN_HACKS
   crontab_del();
+#endif /* !CYGWIN_HACKS */
   fatal(msg, 0);
 }