Changeset 6505


Ignore:
Timestamp:
Aug 29, 2016 6:05:41 PM (6 years ago)
Author:
ldelgass
Message:

merge from trunk

Location:
nanoscale/branches/1.0
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • nanoscale/branches/1.0

  • nanoscale/branches/1.0/aclocal.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • nanoscale/branches/1.0/cf

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • nanoscale/branches/1.0/configure.ac

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • nanoscale/branches/1.0/renderservers.tcl.in

    r6403 r6505  
    134134    MSMSSERVER ${libdir}/vmd/msms
    135135    STRIDE_BIN ${libdir}/vmd/stride
    136     LD_LIBRARY_PATH ${libdir}
     136    LD_LIBRARY_PATH ""
    137137    __GL_SYNC_TO_VBLANK 0
    138138}
  • nanoscale/branches/1.0/server.c

    r4241 r6505  
    308308    f = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
    309309    if (f < 0) {
    310         Tcl_AppendResult(interp, "can't create listerner socket for \"",
     310        Tcl_AppendResult(interp, "can't create listener socket for \"",
    311311                serverPtr->name, "\": ", Tcl_PosixError(interp), (char *)NULL);
    312312        goto error;
     
    606606                    }
    607607                }
     608                /* Make sure to close syslog in case it is using one of
     609                 * the file descriptors we are about to close
     610                 */
     611                closelog();
    608612                /* Dup the socket to descriptors, e.g. 3 and 4 */
    609613                if (dup2(sock, serverPtr->inputFd) < 0)  { /* input */
  • nanoscale/branches/1.0/start_nanoscale.sh.in

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.