--- a/ObjFLoader.st Mon Jun 15 12:01:48 1998 +0200
+++ b/ObjFLoader.st Mon Jun 15 15:09:56 1998 +0200
@@ -159,37 +159,60 @@
#ifdef WIN_DL
# ifdef WIN32
-# undef INT
-# undef Array
-# undef Number
-# undef Method
-# undef Block
-
-# ifdef i386
-# ifndef _X86_
-# define _X86_
-# endif
+# undef INT
+# undef Array
+# undef Number
+# undef Method
+# undef Block
+
+# ifdef i386
+# ifndef _X86_
+# define _X86_
# endif
-
+# endif
+
+# ifdef __BORLANDC__
+# define NOATOM
+# define NOUSER
+# define NOGDI
+# define NOGDICAPMASKS
+# define NOMETAFILE
+# define NOMINMAX
+# define NOMSG
+# define NOOPENFILE
+# define NORASTEROPS
+# define NOSCROLL
+# define NOSOUND
+# define NOSYSMETRICS
+# define NOTEXTMETRIC
+# define NOWH
+# define NOCOMM
+# define NOKANJI
+# define NOCRYPT
+# define NOMCX
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h> /* */
+# else
/* # include <windows.h> /* */
+# endif
# include <windef.h> /* */
# include <winbase.h> /* */
-# ifdef __DEF_Array
-# define Array __DEF_Array
-# endif
-# ifdef __DEF_Number
-# define Number __DEF_Number
-# endif
-# ifdef __DEF_Method
-# define Method __DEF_Method
-# endif
-# ifdef __DEF_Block
-# define Block __DEF_Block
-# endif
+# ifdef __DEF_Array
+# define Array __DEF_Array
+# endif
+# ifdef __DEF_Number
+# define Number __DEF_Number
+# endif
+# ifdef __DEF_Method
+# define Method __DEF_Method
+# endif
+# ifdef __DEF_Block
+# define Block __DEF_Block
+# endif
# endif
-#endif
+#endif /* WIN_DL */
%}
! !
@@ -3446,6 +3469,6 @@
!ObjectFileLoader class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libcomp/Attic/ObjFLoader.st,v 1.166 1998-05-27 10:28:59 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libcomp/Attic/ObjFLoader.st,v 1.167 1998-06-15 13:09:56 cg Exp $'
! !
ObjectFileLoader initialize!
--- a/ObjectFileLoader.st Mon Jun 15 12:01:48 1998 +0200
+++ b/ObjectFileLoader.st Mon Jun 15 15:09:56 1998 +0200
@@ -159,37 +159,60 @@
#ifdef WIN_DL
# ifdef WIN32
-# undef INT
-# undef Array
-# undef Number
-# undef Method
-# undef Block
-
-# ifdef i386
-# ifndef _X86_
-# define _X86_
-# endif
+# undef INT
+# undef Array
+# undef Number
+# undef Method
+# undef Block
+
+# ifdef i386
+# ifndef _X86_
+# define _X86_
# endif
-
+# endif
+
+# ifdef __BORLANDC__
+# define NOATOM
+# define NOUSER
+# define NOGDI
+# define NOGDICAPMASKS
+# define NOMETAFILE
+# define NOMINMAX
+# define NOMSG
+# define NOOPENFILE
+# define NORASTEROPS
+# define NOSCROLL
+# define NOSOUND
+# define NOSYSMETRICS
+# define NOTEXTMETRIC
+# define NOWH
+# define NOCOMM
+# define NOKANJI
+# define NOCRYPT
+# define NOMCX
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h> /* */
+# else
/* # include <windows.h> /* */
+# endif
# include <windef.h> /* */
# include <winbase.h> /* */
-# ifdef __DEF_Array
-# define Array __DEF_Array
-# endif
-# ifdef __DEF_Number
-# define Number __DEF_Number
-# endif
-# ifdef __DEF_Method
-# define Method __DEF_Method
-# endif
-# ifdef __DEF_Block
-# define Block __DEF_Block
-# endif
+# ifdef __DEF_Array
+# define Array __DEF_Array
+# endif
+# ifdef __DEF_Number
+# define Number __DEF_Number
+# endif
+# ifdef __DEF_Method
+# define Method __DEF_Method
+# endif
+# ifdef __DEF_Block
+# define Block __DEF_Block
+# endif
# endif
-#endif
+#endif /* WIN_DL */
%}
! !
@@ -3446,6 +3469,6 @@
!ObjectFileLoader class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libcomp/ObjectFileLoader.st,v 1.166 1998-05-27 10:28:59 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libcomp/ObjectFileLoader.st,v 1.167 1998-06-15 13:09:56 cg Exp $'
! !
ObjectFileLoader initialize!