Merge debian.(none):/M50/bug14685-5.0

into debian.(none):/M51/bug14685-5.1

Merge debian.(none):/M50/bug14685-5.0
into debian.(none):/M51/bug14685-5.1
c201a635 · joerg@debian.(none) · a9e05f8c · 4fbdddf2 · c201a635
Commit c201a635 authored Apr 23, 2007 by joerg@debian.(none)
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

dbug/dbug_analyze.c dbug/dbug_analyze.c +3 -1

No files found.
--- a/dbug/dbug_analyze.c
+++ b/dbug/dbug_analyze.c
@@ -574,10 +574,12 @@ int main (int argc, char **argv)
    FILE *infile;
    FILE *outfile = {stdout};
-#if defined(HAVE_PTHREAD_INIT) && defined(THREAD)
+#ifdef THREAD
+#if defined(HAVE_PTHREAD_INIT)
  pthread_init();                       /* Must be called before DBUG_ENTER */
 #endif
  my_thread_global_init();
+#endif /* THREAD */
  {
    DBUG_ENTER ("main");
    DBUG_PROCESS (argv[0]);