diff --git a/C/stdpreds.c b/C/stdpreds.c index aef317457..d2a9936b8 100644 --- a/C/stdpreds.c +++ b/C/stdpreds.c @@ -11,8 +11,11 @@ * File: stdpreds.c * * comments: General-purpose C implemented system predicates * * * -* Last rev: $Date: 2006-02-05 02:17:54 $,$Author: tiagosoares $ * +* Last rev: $Date: 2006-02-05 02:26:35 $,$Author: tiagosoares $ * * $Log: not supported by cvs2svn $ +* Revision 1.99 2006/02/05 02:17:54 tiagosoares +* MYDDAS: Top Level Functionality +* * Revision 1.98 2005/12/17 03:25:39 vsc * major changes to support online event-based profiling * improve error discovery and restart on scanner. @@ -2856,9 +2859,6 @@ Yap_InitBackCPreds(void) #if defined CUT_C && (defined MYDDAS_ODBC || defined MYDDAS_MYSQL) Yap_InitBackMYDDAS_SharedPreds(); #endif -#if defined CUT_C && (defined MYDDAS_ODBC || defined MYDDAS_MYSQL) - Yap_InitBackMYDDAS_testPreds(); -#endif } typedef void (*Proc)(void); @@ -2970,9 +2970,6 @@ Yap_InitCPreds(void) #endif #if defined MYDDAS_TOP_LEVEL && defined MYDDAS_MYSQL // && defined HAVE_LIBREADLINE Yap_InitMYDDAS_TopLevelPreds(); -#endif -#if defined CUT_C && (defined MYDDAS_ODBC || defined MYDDAS_MYSQL) - Yap_InitMYDDAS_testPreds(); #endif Yap_InitUserCPreds(); Yap_InitUtilCPreds(); diff --git a/H/Yapproto.h b/H/Yapproto.h index abe1a44a8..1676c3fca 100644 --- a/H/Yapproto.h +++ b/H/Yapproto.h @@ -10,7 +10,7 @@ * File: Yap.proto * * mods: * * comments: Function declarations for YAP * -* version: $Id: Yapproto.h,v 1.68 2006-02-05 02:17:55 tiagosoares Exp $ * +* version: $Id: Yapproto.h,v 1.69 2006-02-05 02:26:35 tiagosoares Exp $ * *************************************************************************/ /* prototype file for Yap */ @@ -336,10 +336,6 @@ void STD_PROTO(Yap_InitBackMYDDAS_SharedPreds,(void)); #if defined MYDDAS_TOP_LEVEL && defined MYDDAS_MYSQL //&& defined HAVE_LIBREADLINE void STD_PROTO(Yap_InitMYDDAS_TopLevelPreds,(void)); #endif -#if defined CUT_C && (defined MYDDAS_ODBC || defined MYDDAS_MYSQL) -void STD_PROTO(Yap_InitMYDDAS_testPreds,(void)); -void STD_PROTO(Yap_InitBackMYDDAS_testPreds,(void)); -#endif /* ypsocks.c */ void STD_PROTO(Yap_InitSockets,(void)); diff --git a/MYDDAS/myddas_statistics.h b/MYDDAS/myddas_statistics.h index cb41575c0..d065f42eb 100644 --- a/MYDDAS/myddas_statistics.h +++ b/MYDDAS/myddas_statistics.h @@ -13,7 +13,7 @@ TIME->u.time_final.miliseconds, \ TIME->u.time_final.microseconds); \ } else { \ - printf ("%d Seconds, %d Microseconds", \ + printf ("%lu Seconds, %lu Microseconds", \ TIME->u.time_copy.tv_sec, \ TIME->u.time_copy.tv_usec); \ }