Miscellany

Index: pigment/CMakeLists.txt
===================================================================
--- pigment/CMakeLists.txt	(revision 790494)
+++ pigment/CMakeLists.txt	(working copy)
@@ -13,11 +13,8 @@
 endif(OPENEXR_FOUND)
 
 if(MSVC)
-  add_definitions(-Dand=&& -Dor=|| -Dnot=!)
   # avoid "cannot open file 'LIBC.lib'" error
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:LIBC.LIB")
-else(MSVC)
-  add_definitions("-Dand=\\&\\& -Dor=\\|\\| -Dnot=\\!")
 endif(MSVC)
 
 message(STATUS ${OPENCTL_FOUND})
Index: pigment/pigment_export.h
===================================================================
--- pigment/pigment_export.h	(revision 790494)
+++ pigment/pigment_export.h	(working copy)
@@ -42,4 +42,16 @@
 
 #endif
 
+#if !defined and
+#define and &&
 #endif
+
+#if !defined or
+#define or ||
+#endif
+
+#if !defined not
+#define not !
+#endif
+
+#endif