From: Brian Paul <brianp@vmware.com>
Date: Wed, 7 Jan 2009 15:32:21 +0000 (-0700)
Subject: glsl: remove dead code
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5dfd429c7e7a543a4a4f62e437c371003e42a029;p=mesa.git

glsl: remove dead code
---

diff --git a/src/mesa/shader/slang/slang_log.c b/src/mesa/shader/slang/slang_log.c
index 25f696f67ea..d5576d7ee2d 100644
--- a/src/mesa/shader/slang/slang_log.c
+++ b/src/mesa/shader/slang/slang_log.c
@@ -1,8 +1,9 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.3
+ * Version:  7.3
  *
  * Copyright (C) 2005-2007  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -43,11 +44,7 @@ void
 slang_info_log_destruct(slang_info_log * log)
 {
    if (!log->dont_free_text)
-#if 0
-      slang_alloc_free(log->text);
-#else
       _mesa_free(log->text);
-#endif
 }
 
 static int
@@ -64,18 +61,10 @@ slang_info_log_message(slang_info_log * log, const char *prefix,
    if (log->text != NULL) {
       GLuint old_len = slang_string_length(log->text);
       log->text = (char *)
-#if 0
-	 slang_alloc_realloc(log->text, old_len + 1, old_len + size);
-#else
 	 _mesa_realloc(log->text, old_len + 1, old_len + size);
-#endif
    }
    else {
-#if 0
-      log->text = (char *) (slang_alloc_malloc(size));
-#else
       log->text = (char *) (_mesa_malloc(size));
-#endif
       if (log->text != NULL)
          log->text[0] = '\0';
    }