Changeset 848 for trunk


Ignore:
Timestamp:
Sep 27, 2006, 1:20:34 AM (12 years ago)
Author:
bruno
Message:

Fix compiles issues

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/src/common/libmondo-filelist.c

    r839 r848  
    13651365        asprintf(&strtmp,
    13661366             "find %s -maxdepth %d -fstype mvfs -prune -o -path /dev/shm -prune -o %s -type d -print > %s 2> /dev/null",
    1367              dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
     1367             dir, MAX_SKEL_DEPTH, find_excludes, skeleton_filelist);
    13681368#else
    13691369        // On BSD, for example, /sys is the kernel sources -- don't exclude
    13701370        asprintf(&strtmp,
    13711371             "find %s -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o %s -type d -print > %s 2> /dev/null",
    1372                 dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
    1373 >>>>>>> .merge-right.r838
     1372                dir, MAX_SKEL_DEPTH, find_excludes, skeleton_filelist);
    13741373#endif
    13751374        paranoid_free(find_excludes);
Note: See TracChangeset for help on using the changeset viewer.