WIN32 is not always defined on Windows platform, while _WIN32 is. Remove trailing spaces and replace c++ comments by C ones

SVN revision: 31302
This commit is contained in:
doursse 2007-08-13 12:13:03 +00:00 committed by doursse
parent f619a05536
commit fd9e6e06bf
2 changed files with 46 additions and 46 deletions

View File

@ -6,13 +6,13 @@
#include <setjmp.h> #include <setjmp.h>
#ifndef WIN32 #ifndef _WIN32
static sigjmp_buf detect_buf; static sigjmp_buf detect_buf;
#endif #endif
static int cpu_feature_mask = 0; static int cpu_feature_mask = 0;
#ifndef WIN32 #ifndef _WIN32
static void evas_common_cpu_catch_ill(int sig); static void evas_common_cpu_catch_ill(int sig);
static void evas_common_cpu_catch_segv(int sig); static void evas_common_cpu_catch_segv(int sig);
@ -81,7 +81,7 @@ evas_common_cpu_vis_test(void)
int int
evas_common_cpu_feature_test(void (*feature)(void)) evas_common_cpu_feature_test(void (*feature)(void))
{ {
#ifndef WIN32 #ifndef _WIN32
int enabled = 1; int enabled = 1;
struct sigaction act, oact, oact2; struct sigaction act, oact, oact2;

View File

@ -298,8 +298,8 @@ evas_module_load(Evas_Module *em)
if (em->loaded) return 1; if (em->loaded) return 1;
// printf("LOAD %s\n", em->name); /* printf("LOAD %s\n", em->name); */
#ifdef WIN32 #ifdef _WIN32
snprintf(buf, sizeof(buf), "%s/%s/%s/module.dll", em->path, em->name, MODULE_ARCH); snprintf(buf, sizeof(buf), "%s/%s/%s/module.dll", em->path, em->name, MODULE_ARCH);
#else #else
snprintf(buf, sizeof(buf), "%s/%s/%s/module.so", em->path, em->name, MODULE_ARCH); snprintf(buf, sizeof(buf), "%s/%s/%s/module.so", em->path, em->name, MODULE_ARCH);
@ -367,14 +367,14 @@ void
evas_module_ref(Evas_Module *em) evas_module_ref(Evas_Module *em)
{ {
em->ref++; em->ref++;
// printf("M: %s ref++ = %i\n", em->name, em->ref); /* printf("M: %s ref++ = %i\n", em->name, em->ref); */
} }
void void
evas_module_unref(Evas_Module *em) evas_module_unref(Evas_Module *em)
{ {
em->ref--; em->ref--;
// printf("M: %s ref-- = %i\n", em->name, em->ref); /* printf("M: %s ref-- = %i\n", em->name, em->ref); */
} }
static int use_count = 0; static int use_count = 0;
@ -416,12 +416,12 @@ evas_module_clean(void)
use_count++; use_count++;
if (use_count > 0x0fffffff) use_count = 0; if (use_count > 0x0fffffff) use_count = 0;
// printf("CLEAN!\n"); /* printf("CLEAN!\n"); */
/* go through all modules */ /* go through all modules */
for (l = evas_modules; l; l = l->next) for (l = evas_modules; l; l = l->next)
{ {
em = l->data; em = l->data;
// printf("M %s %i %i\n", em->name, em->ref, em->loaded); /* printf("M %s %i %i\n", em->name, em->ref, em->loaded); */
/* if the module is refernced - skip */ /* if the module is refernced - skip */
if ((em->ref > 0) || (!em->loaded)) continue; if ((em->ref > 0) || (!em->loaded)) continue;
/* how many clean cycles ago was this module last used */ /* how many clean cycles ago was this module last used */
@ -430,7 +430,7 @@ evas_module_clean(void)
/* if it was used last more than N clean cycles ago - unload */ /* if it was used last more than N clean cycles ago - unload */
if (ago > 5) if (ago > 5)
{ {
// printf(" UNLOAD %s\n", em->name); /* printf(" UNLOAD %s\n", em->name); */
evas_module_unload(em); evas_module_unload(em);
} }
} }