summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2011-01-04 16:10:56 +0000
committerMatthias Melcher <fltk@matthiasm.com>2011-01-04 16:10:56 +0000
commitbcff5beb33e3b8ce9d161cdd6bd756898e29fe87 (patch)
tree485a172aadb52209d3fe7374a994b4a5d1692ed8
parent023fc6384cb48129bb24439807a3f76f4fb6e0d7 (diff)
STR 2506: after reading Greg's comment, I modified my last commit to use 'dir' on all MSWindows builds
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8181 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--examples/table-sort.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/examples/table-sort.cxx b/examples/table-sort.cxx
index ae3a79d2d..44a8f06d6 100644
--- a/examples/table-sort.cxx
+++ b/examples/table-sort.cxx
@@ -45,17 +45,19 @@
#define MARGIN 20
-#ifdef _MSC_VER
+#ifdef WIN32
// WINDOWS
#define DIRCMD "dir"
#define DIRHEADER { "Date", "Time", "Size", "Filename", "", "", "", "", "" }
+#ifdef _MSC_VER
#define popen _popen
-#else /*_MSC_VER*/
+#endif
+#else /*WIN32*/
// UNIX
#include <ctype.h>
#define DIRCMD "ls -l"
#define DIRHEADER { "Perms", "#L", "Own", "Group", "Size", "Date", "", "", "Filename" }
-#endif /*_MSC_VER*/
+#endif /*WIN32*/
// A single row of columns
class Row {