projects
/
org.ibex.core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2003/04/10 01:41:43
[org.ibex.core.git]
/
src
/
org
/
xwt
/
plat
/
Win32.cc
diff --git
a/src/org/xwt/plat/Win32.cc
b/src/org/xwt/plat/Win32.cc
index
240b39a
..
6ba10bf
100644
(file)
--- a/
src/org/xwt/plat/Win32.cc
+++ b/
src/org/xwt/plat/Win32.cc
@@
-1,4
+1,8
@@
// Copyright 2002 Adam Megacz, see the COPYING file for licensing [LGPL]
// Copyright 2002 Adam Megacz, see the COPYING file for licensing [LGPL]
+#include "GCJ.cc"
+
+// we have to do this because the jpeg libraries use the symbol 'INT32'
+#define INT32 WIN32_INT32
// this has to precede the others so we don't get collisions on min/max
#include <org/xwt/Box.h>
// this has to precede the others so we don't get collisions on min/max
#include <org/xwt/Box.h>
@@
-37,8
+41,6
@@
#include <java/lang/System.h>
#include <java/io/PrintStream.h>
#include <java/lang/System.h>
#include <java/io/PrintStream.h>
-#include "GCJ.cc"
-
#define WM_USER_SETCURSOR WM_USER
#define WM_USER_DISPOSE (WM_USER + 1)
#define WM_USER_CREATEWINDOW (WM_USER + 2)
#define WM_USER_SETCURSOR WM_USER
#define WM_USER_DISPOSE (WM_USER + 1)
#define WM_USER_CREATEWINDOW (WM_USER + 2)