diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
commit | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch) | |
tree | 1e1463b03838a6f36868a4dafc7e652358a51857 /libports/manage-one-thread.c | |
parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'libports/manage-one-thread.c')
-rw-r--r-- | libports/manage-one-thread.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libports/manage-one-thread.c b/libports/manage-one-thread.c index 57b8a9a9..4ea740b2 100644 --- a/libports/manage-one-thread.c +++ b/libports/manage-one-thread.c @@ -69,7 +69,7 @@ ports_manage_port_operations_one_thread (struct port_bucket *bucket, } else { - /* No need to check cancel threshhold here, because + /* No need to check cancel threshold here, because in a single threaded server the cancel is always handled in order. */ status = demuxer (inp, outheadp); |