Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
otb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
David Youssefi
otb
Commits
4e948581
Commit
4e948581
authored
15 years ago
by
Jordi Inglada
Browse files
Options
Downloads
Plain Diff
Automated merge with
http://hg.orfeo-toolbox.org/OTB
parents
dc62a8c3
f864d91d
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Utilities/FLTK/src/filename_list.cxx
+1
-4
1 addition, 4 deletions
Utilities/FLTK/src/filename_list.cxx
with
1 addition
and
4 deletions
Utilities/FLTK/src/filename_list.cxx
+
1
−
4
View file @
4e948581
...
@@ -61,9 +61,6 @@ int fl_filename_list(const char *d, dirent ***list,
...
@@ -61,9 +61,6 @@ int fl_filename_list(const char *d, dirent ***list,
#elif defined(__hpux) || defined(__CYGWIN__) || defined(sun)
#elif defined(__hpux) || defined(__CYGWIN__) || defined(sun)
// HP-UX, Cygwin define the comparison function like this:
// HP-UX, Cygwin define the comparison function like this:
int
n
=
scandir
(
d
,
list
,
0
,
(
int
(
*
)(
const
dirent
**
,
const
dirent
**
))
sort
);
int
n
=
scandir
(
d
,
list
,
0
,
(
int
(
*
)(
const
dirent
**
,
const
dirent
**
))
sort
);
#elif defined(HAVE_SCANDIR_POSIX)
// POSIX (2008) defines the comparison function like this:
int
n
=
scandir
(
d
,
list
,
0
,
(
int
(
*
)(
const
dirent
**
,
const
dirent
**
))
sort
);
#elif defined(__osf__)
#elif defined(__osf__)
// OSF, DU 4.0x
// OSF, DU 4.0x
int
n
=
scandir
(
d
,
list
,
0
,
(
int
(
*
)(
dirent
**
,
dirent
**
))
sort
);
int
n
=
scandir
(
d
,
list
,
0
,
(
int
(
*
)(
dirent
**
,
dirent
**
))
sort
);
...
@@ -74,7 +71,7 @@ int fl_filename_list(const char *d, dirent ***list,
...
@@ -74,7 +71,7 @@ int fl_filename_list(const char *d, dirent ***list,
// The vast majority of UNIX systems want the sort function to have this
// The vast majority of UNIX systems want the sort function to have this
// prototype, most likely so that it can be passed to qsort without any
// prototype, most likely so that it can be passed to qsort without any
// changes:
// changes:
int
n
=
scandir
(
d
,
list
,
0
,
(
int
(
*
)(
const
dirent
*
*
,
const
dirent
*
*
))
sort
);
int
n
=
scandir
(
d
,
list
,
0
,
(
int
(
*
)(
const
void
*
,
const
void
*
))
sort
);
#else
#else
// This version is when we define our own scandir (WIN32 and perhaps
// This version is when we define our own scandir (WIN32 and perhaps
// some Unix systems) and apparently on IRIX:
// some Unix systems) and apparently on IRIX:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment