3 files changed, 7 insertions, 7 deletions

diff --git a/html.c b/html.c
index 33a956f..76fa6c4 100644
--- a/html.c
+++ b/html.c
@@ -149,25 +149,25 @@ void html_link_close(void)
 void html_fileperm(unsigned short mode)
 {
         htmlf("%c%c%c", (mode & 4 ? 'r' : '-'), 
               (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-'));
 }
 
 void html_filemode(unsigned short mode)
 {
         if (S_ISDIR(mode))
                 html("d");
         else if (S_ISLNK(mode))
                 html("l");
-        else if (S_ISDIRLNK(mode))
+        else if (S_ISGITLINK(mode))
                 html("m");
         else
                 html("-");
         html_fileperm(mode >> 6);
         html_fileperm(mode >> 3);
         html_fileperm(mode);
 }
 
 int html_include(const char *filename)
 {
         FILE *f;
         char buf[4096];
diff --git a/ui-diff.c b/ui-diff.c
index e6b957c..4695e3a 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -28,25 +28,25 @@ static void print_line(char *line, int len)
         line[len-1] = '\0';
         html_txt(line);
         html("</div>");
         line[len-1] = c;
 }
 
 static void header(unsigned char *sha1, char *path1, int mode1,
                    unsigned char *sha2, char *path2, int mode2)
 {
         char *abbrev1, *abbrev2;
         int subproject;
 
-        subproject = (S_ISDIRLNK(mode1) || S_ISDIRLNK(mode2));
+        subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
         html("<div class='head'>");
         html("diff --git a/");
         html_txt(path1);
         html(" b/");
         html_txt(path2);
 
         if (is_null_sha1(sha1))
                 path1 = "dev/null";
         if (is_null_sha1(sha2))
                 path2 = "dev/null";
 
         if (mode1 == 0)
@@ -69,28 +69,28 @@ static void header(unsigned char *sha1, char *path1, int mode1,
                 html("<br/>--- a/");
                 html_txt(path1);
                 html("<br/>+++ b/");
                 html_txt(path2);
         }
         html("</div>");
 }
 
 static void filepair_cb(struct diff_filepair *pair)
 {
         header(pair->one->sha1, pair->one->path, pair->one->mode,
                pair->two->sha1, pair->two->path, pair->two->mode);
-        if (S_ISDIRLNK(pair->one->mode) || S_ISDIRLNK(pair->two->mode)) {
-                if (S_ISDIRLNK(pair->one->mode))
+        if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
+                if (S_ISGITLINK(pair->one->mode))
                         print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
-                if (S_ISDIRLNK(pair->two->mode))
+                if (S_ISGITLINK(pair->two->mode))
                         print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
                 return;
         }
         if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
                 cgit_print_error("Error running diff");
 }
 
 void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, char *path)
 {
         unsigned char sha1[20], sha2[20];
         enum object_type type;
         unsigned long size;
diff --git a/ui-tree.c b/ui-tree.c
index cb57d8d..21dd533 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -11,34 +11,34 @@
 char *curr_rev;
 
 static int print_entry(const unsigned char *sha1, const char *base,
                        int baselen, const char *pathname, unsigned int mode,
                        int stage)
 {
         char *name;
         enum object_type type;
         unsigned long size = 0;
 
         name = xstrdup(pathname);
         type = sha1_object_info(sha1, &size);
-        if (type == OBJ_BAD && !S_ISDIRLNK(mode)) {
+        if (type == OBJ_BAD && !S_ISGITLINK(mode)) {
                 htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
                       name,
                       sha1_to_hex(sha1));
                 return 0;
         }
         html("<tr><td class='filemode'>");
         html_filemode(mode);
         html("</td><td ");
-        if (S_ISDIRLNK(mode)) {
+        if (S_ISGITLINK(mode)) {
                 htmlf("class='ls-mod'><a href='");
                 html_attr(fmt(cgit_repo->module_link,
                               name,
                               sha1_to_hex(sha1)));
         } else if (S_ISDIR(mode)) {
                 html("class='ls-dir'><a href='");
                 html_attr(cgit_pageurl(cgit_query_repo, "tree",
                                        fmt("h=%s&amp;id=%s&amp;path=%s%s/",
                                            curr_rev,
                                            sha1_to_hex(sha1),
                                            cgit_query_path ? cgit_query_path : "",
                                            pathname)));