[BACK]Return to ox_asir.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / io

Diff for /OpenXM_contrib2/asir2000/io/ox_asir.c between version 1.60 and 1.61

version 1.60, 2006/02/11 09:10:16 version 1.61, 2006/02/13 10:07:19
Line 44 
Line 44 
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY   * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.59 2006/02/08 02:11:19 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.60 2006/02/11 09:10:16 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "parse.h"  #include "parse.h"
Line 858  void ox_asir_init(int argc,char **argv,char *servernam
Line 858  void ox_asir_init(int argc,char **argv,char *servernam
         FILE *ifp;          FILE *ifp;
         char *homedir;          char *homedir;
         char *ptr;          char *ptr;
           int do_server_sav;
 #if !defined(VISUAL)  #if !defined(VISUAL)
         int tmp;          int tmp;
 #endif  #endif
Line 916  void ox_asir_init(int argc,char **argv,char *servernam
Line 917  void ox_asir_init(int argc,char **argv,char *servernam
   
         if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {          if ( do_asirrc && (ifp = fopen(ifname,"r")) ) {
                 fclose(ifp);                  fclose(ifp);
                   do_server_sav = do_server_in_X11;
                   do_server_in_X11 = 0;
                 if ( !SETJMP(main_env) )                  if ( !SETJMP(main_env) )
                         execasirfile(ifname);                          execasirfile(ifname);
                   do_server_in_X11 = do_server_sav;
         }          }
   
 /* XXX Windows compatibility */  /* XXX Windows compatibility */

Legend:
Removed from v.1.60  
changed lines
  Added in v.1.61

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>