← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/thr_alarm.c

  • Committer: Monty Taylor
  • Date: 2008-07-02 14:35:48 UTC
  • mto: This revision was merged to the branch mainline in revision 51.
  • Revision ID: monty@inaugust.com-20080702143548-onj30ry0sugr01uw
Removed all references to THREAD.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/thr_alarm.c
17
17
#define FORCE_DBUG_OFF
18
18
#include <my_global.h>
19
19
 
20
 
#if defined(THREAD) && !defined(DONT_USE_THR_ALARM)
 
20
#if !defined(DONT_USE_THR_ALARM)
21
21
#include <errno.h>
22
22
#include <my_pthread.h>
23
23
#include <signal.h>
603
603
***************************************************************************/
604
604
 
605
605
#ifdef MAIN
606
 
#if defined(THREAD) && !defined(DONT_USE_THR_ALARM)
 
606
#if !defined(DONT_USE_THR_ALARM)
607
607
 
608
608
static pthread_cond_t COND_thread_count;
609
609
static pthread_mutex_t LOCK_thread_count;
872
872
  return 0;
873
873
}
874
874
 
875
 
#else /* THREAD */
 
875
#else /* DONT_USE_THR_ALARM */
876
876
 
877
877
int main(int argc __attribute__((unused)),char **argv __attribute__((unused)))
878
878
{
879
 
#ifndef THREAD
880
 
  printf("thr_alarm disabled because we are not using threads\n");
881
 
#else
882
879
  printf("thr_alarm disabled with DONT_USE_THR_ALARM\n");
883
 
#endif
884
880
  exit(1);
885
881
}
886
882
 
887
 
#endif /* THREAD */
 
883
#endif /* DONT_USE_THR_ALARM */
888
884
#endif /* MAIN */