diff options
| author | Guenter Geiger <ggeiger@users.sourceforge.net> | 2003-05-09 16:04:00 +0000 |
|---|---|---|
| committer | Guenter Geiger <ggeiger@users.sourceforge.net> | 2003-05-09 16:04:00 +0000 |
| commit | 9c0e19a3be2288db79e2502e5fa450c3e20a668d (patch) | |
| tree | ca97ce615e037a533304fc4660dcf372ca3b9cd6 /pd/src/x_misc.c | |
| parent | ef50dd62804d54af7da18d8bd8413c0dccd729b8 (diff) | |
This commit was generated by cvs2svn to compensate for changes in r610,
which included commits to RCS files with non-trunk default branches.
svn path=/trunk/; revision=611
Diffstat (limited to 'pd/src/x_misc.c')
| -rw-r--r-- | pd/src/x_misc.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pd/src/x_misc.c b/pd/src/x_misc.c index 8ba5191f..cd9771b0 100644 --- a/pd/src/x_misc.c +++ b/pd/src/x_misc.c @@ -4,7 +4,8 @@ /* misc. */ -#include "m_imp.h" +#include "m_pd.h" +#include "s_stuff.h" #include <math.h> #include <stdio.h> #include <string.h> @@ -14,7 +15,7 @@ #include <sys/times.h> #include <sys/param.h> #endif -#ifdef NT +#ifdef MSW #include <wtypes.h> #include <time.h> #endif @@ -140,7 +141,7 @@ static void namecanvas_setup(void) sizeof(t_namecanvas), CLASS_NOINLET, A_DEFSYM, 0); } -/* ---------------serial ports (NT only -- hack) ------------------------- */ +/* ---------------serial ports (MSW only -- hack) ------------------------- */ #define MAXSERIAL 100 static t_class *serial_class; @@ -192,7 +193,7 @@ typedef struct _cputime #ifdef UNIX struct tms x_setcputime; #endif -#ifdef NT +#ifdef MSW LARGE_INTEGER x_kerneltime; LARGE_INTEGER x_usertime; int x_warned; @@ -204,7 +205,7 @@ static void cputime_bang(t_cputime *x) #ifdef UNIX times(&x->x_setcputime); #endif -#ifdef NT +#ifdef MSW FILETIME ignorethis, ignorethat; BOOL retval; retval = GetProcessTimes(GetCurrentProcess(), &ignorethis, &ignorethat, @@ -231,7 +232,7 @@ static void cputime_bang2(t_cputime *x) x->x_setcputime.tms_utime - x->x_setcputime.tms_stime) / HZ; outlet_float(x->x_obj.ob_outlet, elapsedcpu); #endif -#ifdef NT +#ifdef MSW float elapsedcpu; FILETIME ignorethis, ignorethat; LARGE_INTEGER usertime, kerneltime; @@ -254,7 +255,7 @@ static void *cputime_new(void) outlet_new(&x->x_obj, gensym("float")); inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("bang"), gensym("bang2")); -#ifdef NT +#ifdef MSW x->x_warned = 0; #endif cputime_bang(x); |