diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-02-18 22:07:40 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-02-18 22:07:40 +0000 |
| commit | b3ef28260e59a14e0bc8c2dd60bd1bc03782819f (patch) | |
| tree | f8d819ed1848a36e1ef3388e3c0e30c6373afd67 /FL | |
| parent | 480101ea19482afd576d7583a505e811e8641bc4 (diff) | |
Updated DLL stuff yet again... sigh...
git-svn-id: file:///fltk/svn/fltk/trunk@296 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Enumerations.H | 15 | ||||
| -rw-r--r-- | FL/filename.H | 15 |
2 files changed, 12 insertions, 18 deletions
diff --git a/FL/Enumerations.H b/FL/Enumerations.H index 4aecd5f7e..18dc3baba 100644 --- a/FL/Enumerations.H +++ b/FL/Enumerations.H @@ -1,5 +1,5 @@ // -// "$Id: Enumerations.H,v 1.14 1999/02/18 14:26:36 mike Exp $" +// "$Id: Enumerations.H,v 1.15 1999/02/18 22:07:38 mike Exp $" // // Enumerations for the Fast Light Tool Kit (FLTK). // @@ -30,21 +30,18 @@ // The following is only used when building DLLs under WIN32 or OS/2... // -#ifdef _MSC_VER -# ifdef FL_DLL +#ifdef FL_DLL +# ifdef FL_LIBRARY # define FL_EXPORT __declspec(dllexport) # define FL_IMPORT __declspec(dllimport) -# elif defined(FL_STATIC) -# define FL_EXPORT -# define FL_IMPORT # else # define FL_EXPORT __declspec(dllimport) # define FL_IMPORT __declspec(dllexport) -# endif /* FL_DLL */ +# endif /* FL_LIBRARY */ #else # define FL_EXPORT # define FL_IMPORT -#endif /* _MSC_VER */ +#endif /* FL_DLL */ // // The FLTK version number; this is changed slightly from the beta versions @@ -371,5 +368,5 @@ enum Fl_Damage { #endif // -// End of "$Id: Enumerations.H,v 1.14 1999/02/18 14:26:36 mike Exp $". +// End of "$Id: Enumerations.H,v 1.15 1999/02/18 22:07:38 mike Exp $". // diff --git a/FL/filename.H b/FL/filename.H index 5e3ed72cc..4ae28207a 100644 --- a/FL/filename.H +++ b/FL/filename.H @@ -1,5 +1,5 @@ // -// "$Id: filename.H,v 1.8 1999/02/18 14:26:37 mike Exp $" +// "$Id: filename.H,v 1.9 1999/02/18 22:07:39 mike Exp $" // // Filename header file for the Fast Light Tool Kit (FLTK). // @@ -30,21 +30,18 @@ // The following is only used when building DLLs under WIN32 or OS/2... // -#ifdef _MSC_VER -# ifdef FL_DLL +#ifdef FL_DLL +# ifdef FL_LIBRARY # define FL_EXPORT __declspec(dllexport) # define FL_IMPORT __declspec(dllimport) -# elif defined(FL_STATIC) -# define FL_EXPORT -# define FL_IMPORT # else # define FL_EXPORT __declspec(dllimport) # define FL_IMPORT __declspec(dllexport) -# endif /* FL_DLL */ +# endif /* FL_LIBRARY */ #else # define FL_EXPORT # define FL_IMPORT -#endif /* _MSC_VER */ +#endif /* FL_DLL */ #define FL_PATH_MAX 256 // all buffers are this length @@ -82,5 +79,5 @@ FL_EXPORT int filename_list(const char *d, struct dirent ***list); #endif // -// End of "$Id: filename.H,v 1.8 1999/02/18 14:26:37 mike Exp $". +// End of "$Id: filename.H,v 1.9 1999/02/18 22:07:39 mike Exp $". // |