summaryrefslogtreecommitdiff
path: root/FL
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>1999-02-18 14:26:52 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>1999-02-18 14:26:52 +0000
commit40df358bdb300d5377e95d9fee83e010715fd857 (patch)
tree6c719a0a93cd9c155c952aba9d82dbd4ac3f669c /FL
parent3b5208b4b56e586a0cf2fe561a2cded6d1059e3e (diff)
Updated headers to only support DLLs under MSVC++.
Updated WIN32 Debug target to not change inlining option from the default (causes an error with VC++ 6.0) git-svn-id: file:///fltk/svn/fltk/trunk@292 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
-rw-r--r--FL/Enumerations.H8
-rw-r--r--FL/filename.H8
2 files changed, 8 insertions, 8 deletions
diff --git a/FL/Enumerations.H b/FL/Enumerations.H
index 6e0988bc3..4aecd5f7e 100644
--- a/FL/Enumerations.H
+++ b/FL/Enumerations.H
@@ -1,5 +1,5 @@
//
-// "$Id: Enumerations.H,v 1.13 1999/02/18 03:20:31 mike Exp $"
+// "$Id: Enumerations.H,v 1.14 1999/02/18 14:26:36 mike Exp $"
//
// Enumerations for the Fast Light Tool Kit (FLTK).
//
@@ -30,7 +30,7 @@
// The following is only used when building DLLs under WIN32 or OS/2...
//
-#if defined(WIN32) || defined(__EMX__)
+#ifdef _MSC_VER
# ifdef FL_DLL
# define FL_EXPORT __declspec(dllexport)
# define FL_IMPORT __declspec(dllimport)
@@ -44,7 +44,7 @@
#else
# define FL_EXPORT
# define FL_IMPORT
-#endif /* WIN32 || __EMX__ */
+#endif /* _MSC_VER */
//
// The FLTK version number; this is changed slightly from the beta versions
@@ -371,5 +371,5 @@ enum Fl_Damage {
#endif
//
-// End of "$Id: Enumerations.H,v 1.13 1999/02/18 03:20:31 mike Exp $".
+// End of "$Id: Enumerations.H,v 1.14 1999/02/18 14:26:36 mike Exp $".
//
diff --git a/FL/filename.H b/FL/filename.H
index 051c9f4f8..5e3ed72cc 100644
--- a/FL/filename.H
+++ b/FL/filename.H
@@ -1,5 +1,5 @@
//
-// "$Id: filename.H,v 1.7 1999/02/18 03:20:32 mike Exp $"
+// "$Id: filename.H,v 1.8 1999/02/18 14:26:37 mike Exp $"
//
// Filename header file for the Fast Light Tool Kit (FLTK).
//
@@ -30,7 +30,7 @@
// The following is only used when building DLLs under WIN32 or OS/2...
//
-#if defined(WIN32) || defined(__EMX__)
+#ifdef _MSC_VER
# ifdef FL_DLL
# define FL_EXPORT __declspec(dllexport)
# define FL_IMPORT __declspec(dllimport)
@@ -44,7 +44,7 @@
#else
# define FL_EXPORT
# define FL_IMPORT
-#endif /* WIN32 || __EMX__ */
+#endif /* _MSC_VER */
#define FL_PATH_MAX 256 // all buffers are this length
@@ -82,5 +82,5 @@ FL_EXPORT int filename_list(const char *d, struct dirent ***list);
#endif
//
-// End of "$Id: filename.H,v 1.7 1999/02/18 03:20:32 mike Exp $".
+// End of "$Id: filename.H,v 1.8 1999/02/18 14:26:37 mike Exp $".
//