diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-08-02 12:38:10 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-08-02 12:38:10 +0000 |
| commit | afbeea5714673d1872bcf6949c0df714a3770478 (patch) | |
| tree | 71d14a933767d2b3534b353d01bda9625124a8b0 /fluid | |
| parent | c2e889169308b826f68becc4c2c14ede857689c3 (diff) | |
Bump to 1.1.4 and fix changelog.
#ifdef in fluid was wrong - didn't use piping on OSX when not compiling
against Metroworks compiler.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3068 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/fluid.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx index 634964bef..eb3dfb33d 100644 --- a/fluid/fluid.cxx +++ b/fluid/fluid.cxx @@ -1,5 +1,5 @@ // -// "$Id: fluid.cxx,v 1.15.2.13.2.41 2003/08/02 05:54:43 matthiaswm Exp $" +// "$Id: fluid.cxx,v 1.15.2.13.2.42 2003/08/02 12:38:10 easysw Exp $" // // FLUID main entry for the Fast Light Tool Kit (FLTK). // @@ -650,7 +650,7 @@ void update_history(const char *flname) { } // Shell command support... -#if ( !defined(WIN32) || defined(__CYGWIN__) ) && ( !defined(__MWERKS__) && !defined(__APPLE__) ) +#if (!defined(WIN32) || defined(__CYGWIN__)) && !defined(__MWERKS__) // Support the full piped shell command... static FILE *shell_pipe = 0; @@ -769,7 +769,7 @@ do_shell_command(Fl_Return_Button*, void*) { fl_message("Shell command completed successfully!"); } } -#endif // !WIN32 || __CYGWIN__ +#endif // (!WIN32 || __CYGWIN__) && !__MWERKS__ void @@ -886,5 +886,5 @@ int main(int argc,char **argv) { } // -// End of "$Id: fluid.cxx,v 1.15.2.13.2.41 2003/08/02 05:54:43 matthiaswm Exp $". +// End of "$Id: fluid.cxx,v 1.15.2.13.2.42 2003/08/02 12:38:10 easysw Exp $". // |