Index: config/gen/feature_h/feature_h.in
===================================================================
RCS file: /cvs/public/parrot/config/gen/feature_h/feature_h.in,v
retrieving revision 1.11
diff -u -r1.11 feature_h.in
--- config/gen/feature_h/feature_h.in	17 Jul 2003 06:53:11 -0000	1.11
+++ config/gen/feature_h/feature_h.in	13 Aug 2003 02:57:06 -0000
@@ -13,15 +13,15 @@
 EOP
 if (${memalign} eq 'posix_memalign') {
   print OUT <<'END'
-#define HAS_POSIX_MEMALIGN
-#define HAS_SOME_MEMALIGN
+#define PARROT_HAS_POSIX_MEMALIGN
+#define PARROT_HAS_SOME_MEMALIGN
 
 END
 }
 elsif (${memalign} eq 'memalign') {
   print OUT <<'END'
-#define HAS_MEMALIGN
-#define HAS_SOME_MEMALIGN
+#define PARROT_HAS_MEMALIGN
+#define PARROT_HAS_SOME_MEMALIGN
 
 END
 }
@@ -31,7 +31,7 @@
 EOP
 unless (${isreg}) {
 	print OUT <<EOP;
-#define BROKEN_ISREG 1
+#define PARROT_HAS_BROKEN_ISREG 1
 EOP
 }
 
@@ -40,7 +40,7 @@
 
 /* from config/auto/jit */
 #ifdef I386
-#  define HAS_JIT_FCOMIP
+#  define PARROT_HAS_JIT_FCOMIP
 #endif
 
 END
@@ -48,9 +48,9 @@
 
     print OUT <<'END';
 #ifdef __powerpc__
-#  define VA_TO_VAPTR(x) (x)
+#  define PARROT_VA_TO_VAPTR(x) (x)
 #else
-#  define VA_TO_VAPTR(x) (&(x))
+#  define PARROT_VA_TO_VAPTR(x) (&(x))
 #endif
 END
 
@@ -61,20 +61,20 @@
 
 if (${has_sigaction}) {
     print OUT <<'END';
-#define HAS_SIGACTION 1
+#define PARROT_HAS_SIGACTION 1
 END
 }
 
 if (${has___sighandler_t}) {
     print OUT <<'END';
-#define HAS___SIGHANDLER_T 1
+#define PARROT_HAS___SIGHANDLER_T 1
 END
 }
 
 if (${has_setitimer}) {
     print OUT <<'END';
-#define HAS_SETITIMER 1
-#define HAS_SOME_SYS_TIMER 1
+#define PARROT_HAS_SETITIMER 1
+#define PARROT_HAS_SOME_SYS_TIMER 1
 END
 }
 
@@ -84,12 +84,12 @@
 EOP
 if (${setenv}) {
 	print OUT <<EOP;
-#define HAS_SETENV 1
+#define PARROT_HAS_SETENV 1
 EOP
 }
 if (${unsetenv}) {
 	print OUT <<EOP;
-#define HAS_UNSETENV 1
+#define PARROT_HAS_UNSETENV 1
 EOP
 }
 
Index: config/gen/platform/generic.c
===================================================================
RCS file: /cvs/public/parrot/config/gen/platform/generic.c,v
retrieving revision 1.18
diff -u -r1.18 generic.c
--- config/gen/platform/generic.c	12 Aug 2003 18:56:48 -0000	1.18
+++ config/gen/platform/generic.c	13 Aug 2003 02:57:06 -0000
@@ -55,7 +55,7 @@
 void
 Parrot_setenv(const char *name, const char *value)
 {
-#ifdef HAS_SETENV
+#ifdef PARROT_HAS_SETENV
     setenv(name, value, 1);
 #else
     int name_len = strlen(name);
@@ -80,7 +80,7 @@
 void
 Parrot_unsetenv(const char *name)
 {
-#ifdef HAS_UNSETENV
+#ifdef PARROT_HAS_UNSETENV
     unsetenv(name);
 #else
     Parrot_setenv(name, "");
@@ -156,7 +156,7 @@
  * memalign related stuff
  */
 
-#if defined(HAS_POSIX_MEMALIGN)
+#if defined(PARROT_HAS_POSIX_MEMALIGN)
 #include <stdlib.h>
 
 void *
@@ -175,7 +175,7 @@
     return i == 0 ? p : NULL;
 }
 
-#elif defined(HAS_MEMALIGN)
+#elif defined(PARROT_HAS_MEMALIGN)
 
 #if defined(PARROT_HAS_HEADER_MALLOC)
 #include <malloc.h>
Index: config/gen/platform/generic.h
===================================================================
RCS file: /cvs/public/parrot/config/gen/platform/generic.h,v
retrieving revision 1.9
diff -u -r1.9 generic.h
--- config/gen/platform/generic.h	12 Aug 2003 18:56:48 -0000	1.9
+++ config/gen/platform/generic.h	13 Aug 2003 02:57:07 -0000
@@ -38,7 +38,7 @@
 
 #ifdef PARROT_HAS_HEADER_SIGNAL
 #  undef Parrot_set_sighandler
-#  ifdef HAS___SIGHANDLER_T
+#  ifdef PARROT_HAS___SIGHANDLER_T
     typedef __sighandler_t Parrot_sighandler_t;
 #  else
     typedef void (*Parrot_sighandler_t) (int);
Index: config/gen/platform/ansi.c
===================================================================
RCS file: /cvs/public/parrot/config/gen/platform/ansi.c,v
retrieving revision 1.7
diff -u -r1.7 ansi.c
--- config/gen/platform/ansi.c	14 Jul 2003 07:58:20 -0000	1.7
+++ config/gen/platform/ansi.c	13 Aug 2003 02:57:07 -0000
@@ -47,7 +47,7 @@
 void
 Parrot_setenv(const char *name, const char *value)
 {
-#ifdef HAS_SETENV
+#ifdef PARROT_HAS_SETENV
     setenv(name, value, 1);
 #else
     int name_len = strlen(name);
@@ -72,7 +72,7 @@
 void
 Parrot_unsetenv(const char *name)
 {
-#ifdef HAS_UNSETENV
+#ifdef PARROT_HAS_UNSETENV
     unsetenv(name);
 #else 
     Parrot_setenv(name, "");
Index: config/gen/platform/darwin.c
===================================================================
RCS file: /cvs/public/parrot/config/gen/platform/darwin.c,v
retrieving revision 1.9
diff -u -r1.9 darwin.c
--- config/gen/platform/darwin.c	17 Jul 2003 20:51:10 -0000	1.9
+++ config/gen/platform/darwin.c	13 Aug 2003 02:57:08 -0000
@@ -65,7 +65,7 @@
 void
 Parrot_setenv(const char *name, const char *value)
 {
-#ifdef HAS_SETENV
+#ifdef PARROT_HAS_SETENV
     setenv(name, value, 1);
 #else
     int name_len = strlen(name);
@@ -90,7 +90,7 @@
 void
 Parrot_unsetenv(const char *name)
 {
-#ifdef HAS_UNSETENV
+#ifdef PARROT_HAS_UNSETENV
     unsetenv(name);
 #else 
     Parrot_setenv(name, "");
@@ -190,7 +190,7 @@
  * itimer stuff
  */
 
-#ifdef HAS_SETITIMER
+#ifdef PARROT_HAS_SETITIMER
 
 /*
  * Start a system timer with the passed value in milli seconds.
Index: config/gen/platform/platform_interface.h
===================================================================
RCS file: /cvs/public/parrot/config/gen/platform/platform_interface.h,v
retrieving revision 1.7
diff -u -r1.7 platform_interface.h
--- config/gen/platform/platform_interface.h	12 Aug 2003 18:56:48 -0000	1.7
+++ config/gen/platform/platform_interface.h	13 Aug 2003 02:57:08 -0000
@@ -17,7 +17,7 @@
 void *Parrot_memalign_if_possible(size_t align, size_t size);
 void Parrot_free_memalign(void *);
 
-#if !defined(HAS_MEMALIGN) && !defined(HAS_POSIX_MEMALIGN)
+#if !defined(PARROT_HAS_MEMALIGN) && !defined(PARROT_HAS_POSIX_MEMALIGN)
 #  define Parrot_memalign_if_possible(a, s) malloc(a)
 #endif
 
@@ -52,7 +52,7 @@
  * system timer
  */
 
-#ifdef HAS_SOME_SYS_TIMER
+#ifdef PARROT_HAS_SOME_SYS_TIMER
 
 void * new_sys_timer_ms(void);
 void start_sys_timer_ms(void *handle, int ms);
Index: include/parrot/pobj.h
===================================================================
RCS file: /cvs/public/parrot/include/parrot/pobj.h,v
retrieving revision 1.24
diff -u -r1.24 pobj.h
--- include/parrot/pobj.h	24 Jul 2003 01:16:37 -0000	1.24
+++ include/parrot/pobj.h	13 Aug 2003 02:57:10 -0000
@@ -24,7 +24,7 @@
 
 #define ARENA_DOD_FLAGS 1
 
-#if ARENA_DOD_FLAGS && ! defined(HAS_SOME_MEMALIGN)
+#if ARENA_DOD_FLAGS && ! defined(PARROT_HAS_SOME_MEMALIGN)
 #  undef ARENA_DOD_FLAGS
 #  define ARENA_DOD_FLAGS 0
 #endif
Index: jit/i386/jit_emit.h
===================================================================
RCS file: /cvs/public/parrot/jit/i386/jit_emit.h,v
retrieving revision 1.78
diff -u -r1.78 jit_emit.h
--- jit/i386/jit_emit.h	8 Aug 2003 16:40:08 -0000	1.78
+++ jit/i386/jit_emit.h	13 Aug 2003 02:57:21 -0000
@@ -1193,7 +1193,7 @@
 
 #  define emitm_fcomp(pc, sti) emitm_fl_3(pc, emit_b000, emit_b011, sti)
 
-#ifdef HAS_JIT_FCOMIP
+#ifdef PARROT_HAS_JIT_FCOMIP
 #  define emitm_fcomip(pc, sti) emitm_fl_3(pc, emit_b111, emit_b110, sti)
 #  define emitm_fcomi(pc, sti) emitm_fl_3(pc, emit_b011, emit_b110, sti)
 #else
Index: embed.c
===================================================================
RCS file: /cvs/public/parrot/embed.c,v
retrieving revision 1.82
diff -u -r1.82 embed.c
--- embed.c	12 Aug 2003 18:56:45 -0000	1.82
+++ embed.c	13 Aug 2003 02:57:23 -0000
@@ -102,7 +102,7 @@
             return NULL;
         }
 
-#  ifndef BROKEN_ISREG
+#  ifndef PARROT_HAS_BROKEN_ISREG
         /* S_ISREG is strangely broken my lcc/linux install (though it did
 	 * once work */
         if (!S_ISREG(file_stat.st_mode)) {
@@ -110,7 +110,7 @@
                     filename);
             return NULL;
         }
-#  endif /* BROKEN_ISREG */
+#  endif /* PARROT_HAS_BROKEN_ISREG */
 
         program_size = file_stat.st_size;
 
Index: misc.c
===================================================================
RCS file: /cvs/public/parrot/misc.c,v
retrieving revision 1.36
diff -u -r1.36 misc.c
--- misc.c	29 Jul 2003 02:32:15 -0000	1.36
+++ misc.c	13 Aug 2003 02:57:24 -0000
@@ -35,7 +35,7 @@
 Parrot_vsprintf_s(struct Parrot_Interp *interpreter, STRING *pat, va_list args)
 {
     SPRINTF_OBJ obj = va_core;
-    obj.data = VA_TO_VAPTR(args);
+    obj.data = PARROT_VA_TO_VAPTR(args);
 
     return Parrot_sprintf_format(interpreter, pat, &obj);
 }