Author: al
Date: 2009-12-30 22:04:04 +0100 (Wed, 30 Dec 2009)
New Revision: 2921
Modified:
trunk/src/rs-preview-widget.c
Log:
Fixed define and type collisions in windows.
Modified: trunk/src/rs-preview-widget.c
===================================================================
--- trunk/src/rs-preview-widget.c 2009-12-30 21:03:11 UTC (rev 2920)
+++ trunk/src/rs-preview-widget.c 2009-12-30 21:04:04 UTC (rev 2921)
@@ -59,6 +59,10 @@
MOVE = 0x4000, /* 0100 0000 0000 0000 */
} STATE;
+/* In win32 windef32.h will define both near and NEAR */
+#undef NEAR
+#undef near
+
typedef enum {
CROP_NEAR_INSIDE = 0x10, /* 0001 0000 */
CROP_NEAR_OUTSIDE = 0x20, /* 0010 0000 */
@@ -80,8 +84,9 @@
typedef struct {
gint x;
gint y;
-} COORD;
+} RS_COORD;
+
typedef enum {
SPLIT_NONE,
SPLIT_HORIZONTAL,
@@ -135,10 +140,10 @@
GString *crop_text;
GtkWidget *crop_size_label;
RS_RECT crop_move;
- COORD crop_start;
+ RS_COORD crop_start;
- COORD straighten_start;
- COORD straighten_end;
+ RS_COORD straighten_start;
+ RS_COORD straighten_end;
gfloat straighten_angle;
RSFilter *filter_input;
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
