Commit 85a37ee5 authored by Eisenhauer, Greg's avatar Eisenhauer, Greg
Browse files

Merge branch 'upstream-atl' into ATLUpstream

* upstream-atl:
  atl 2018-12-13 (396a3087)
parents 2841275f 4786d5d1
Loading
Loading
Loading
Loading
+10 −10
Original line number Diff line number Diff line
@@ -116,15 +116,15 @@ extern int
add_pattr(attr_list list, atom_t attr_id, attr_value_type val_type, 
	  attr_union value);

static void
deallocate_global_atom_server()
{
    if (global_as) {
        atom_server tmp = global_as;
        global_as = NULL;
        free_atom_server(tmp);
    }
}
/* static void */
/* deallocate_global_atom_server() */
/* { */
/*     if (global_as) { */
/*         atom_server tmp = global_as; */
/*         global_as = NULL; */
/*         free_atom_server(tmp); */
/*     } */
/* } */

static
void
@@ -138,7 +138,7 @@ atom_server *asp;

    if ((asp == &global_as) && first) {
        first = 0;
        atexit(deallocate_global_atom_server);
//      atexit(deallocate_global_atom_server);
    }
}