4 files changed, 11 insertions, 11 deletions
diff --git a/flow/gsl/gbsearcharray.h b/flow/gsl/gbsearcharray.h
index 8eebbb1..afd1a51 100644
--- a/flow/gsl/gbsearcharray.h
+++ b/flow/gsl/gbsearcharray.h
@@ -56,9 +56,9 @@ typedef union
 {
   guint    n_nodes;
   /*< private >*/
-  gpointer tqalignment_dummy1;
-  glong    tqalignment_dummy2;
-  gdouble  tqalignment_dummy3;
+  gpointer alignment_dummy1;
+  glong    alignment_dummy2;
+  gdouble  alignment_dummy3;
 } GBSearchArray;
 
 
diff --git a/flow/gsl/gsl.3 b/flow/gsl/gsl.3
index fe8324e..cd7eb8b 100644
--- a/flow/gsl/gsl.3
+++ b/flow/gsl/gsl.3
@@ -131,7 +131,7 @@ Wake up a currently sleeping thread. In practice, this function simply causes th
 thread to abort
 .PD 1
 .PP
-Abort a currently running thread. This function does not return until the thread in question terminated execution. Note that the thread handle gets tqinvalidated with invocation of \fBgsl_thread_abort()\fP or \fBgsl_thread_queue_abort()\fP.  
+Abort a currently running thread. This function does not return until the thread in question terminated execution. Note that the thread handle gets invalidated with invocation of \fBgsl_thread_abort()\fP or \fBgsl_thread_queue_abort()\fP.  
 .PD
 .SS \fBgsl_thread_queue_abort\fP (\fIthread\fP);
 .PD 0
@@ -139,7 +139,7 @@ Abort a currently running thread. This function does not return until the thread
 thread to abort
 .PD 1
 .PP
-Same as \fBgsl_thread_abort()\fP, but returns as soon as possible, even if thread hasn't stopped execution yet. Note that the thread handle gets tqinvalidated with invocation of \fBgsl_thread_abort()\fP or \fBgsl_thread_queue_abort()\fP.  
+Same as \fBgsl_thread_abort()\fP, but returns as soon as possible, even if thread hasn't stopped execution yet. Note that the thread handle gets invalidated with invocation of \fBgsl_thread_abort()\fP or \fBgsl_thread_queue_abort()\fP.  
 .PD
 .SS \fBgsl_thread_aborted\fP ();
 .PD 0
diff --git a/flow/gsl/gslcommon.c b/flow/gsl/gslcommon.c
index d7892f2..d9f63fa 100644
--- a/flow/gsl/gslcommon.c
+++ b/flow/gsl/gslcommon.c
@@ -684,7 +684,7 @@ gsl_thread_wakeup (GslThread *thread)
  * @thread: thread to abort
  * Abort a currently running thread. This function does not
  * return until the thread in question terminated execution.
- * Note that the thread handle gets tqinvalidated with invocation
+ * Note that the thread handle gets invalidated with invocation
  * of gsl_thread_abort() or gsl_thread_queue_abort().
  */
 void
@@ -715,7 +715,7 @@ gsl_thread_abort (GslThread *thread)
  * @thread: thread to abort
  * Same as gsl_thread_abort(), but returns as soon as possible,
  * even if thread hasn't stopped execution yet.
- * Note that the thread handle gets tqinvalidated with invocation
+ * Note that the thread handle gets invalidated with invocation
  * of gsl_thread_abort() or gsl_thread_queue_abort().
  */
 void
diff --git a/flow/gsl/gsldatahandle-mad.c b/flow/gsl/gsldatahandle-mad.c
index 522efa5..201d352 100644
--- a/flow/gsl/gsldatahandle-mad.c
+++ b/flow/gsl/gsldatahandle-mad.c
@@ -318,14 +318,14 @@ dh_mad_open (GslDataHandle      *dhandle,
   MadHandle *handle = (MadHandle*) dhandle;
   GslHFile *hfile;
   GslLong n;
-  gboolean seek_tqinvalidated = FALSE;
+  gboolean seek_invalidated = FALSE;
 
   hfile = gsl_hfile_open (handle->dhandle.name);
   if (!hfile)
     return gsl_error_from_errno (errno, GSL_ERROR_OPEN_FAILED);
   handle->hfile = hfile;
 
-  seek_tqinvalidated |= handle->seek_mtime != hfile->mtime;
+  seek_invalidated |= handle->seek_mtime != hfile->mtime;
   handle->bfill = 0;
   handle->eof = FALSE;
   handle->pcm_pos = 0;
@@ -345,7 +345,7 @@ dh_mad_open (GslDataHandle      *dhandle,
   setup->bit_depth = 24;
   setup->n_channels = MAD_NCHANNELS (&handle->frame.header);
   n = MAD_NSBSAMPLES (&handle->frame.header) * 32;
-  seek_tqinvalidated |= n != handle->frame_size;
+  seek_invalidated |= n != handle->frame_size;
   handle->frame_size = n;
   handle->sample_rate = handle->frame.header.samplerate;
   if (setup->n_channels < 1 ||
@@ -355,7 +355,7 @@ dh_mad_open (GslDataHandle      *dhandle,
     goto OPEN_FAILED;
   
   /* seek through the stream to collect frame positions */
-  if (seek_tqinvalidated || !handle->n_seeks)
+  if (seek_invalidated || !handle->n_seeks)
     {
       handle->seek_mtime = hfile->mtime;
       handle->n_seeks = 0;