merge of glsl-compiler-1 branch

1 files changed, 8 insertions, 7 deletions

diff --git a/src/mesa/shader/slang/slang_utility.c b/src/mesa/shader/slang/slang_utility.c
index 256d52455d..0fbfcc5840 100644
--- a/src/mesa/shader/slang/slang_utility.c
+++ b/src/mesa/shader/slang/slang_utility.c
@@ -31,11 +31,13 @@
 #include "imports.h"
 #include "slang_utility.h"
 
-char *slang_string_concat (char *dst, const char *src)
+char *
+slang_string_concat (char *dst, const char *src)
 {
-	return _mesa_strcpy (dst + _mesa_strlen (dst), src);
+   return _mesa_strcpy (dst + _mesa_strlen (dst), src);
 }
 
+
 /* slang_string */
 
 GLvoid
@@ -156,8 +158,8 @@ slang_atom_pool_destruct (slang_atom_pool * pool)
          slang_alloc_free(entry->id);
          slang_alloc_free(entry);
          entry = next;
-		}
-	}
+      }
+   }
 }
 
 /*
@@ -211,12 +213,11 @@ slang_atom_pool_atom(slang_atom_pool * pool, const char * id)
    return (slang_atom) (**entry).id;
 }
 
-/*
+/**
  * Return the name of a given atom.
  */
 const char *
 slang_atom_pool_id(slang_atom_pool * pool, slang_atom atom)
 {
-	return (const char *) (atom);
+   return (const char *) (atom);
 }
-