svn merge ^/branches/released .

2 files changed, 133 insertions, 139 deletions

diff --git a/mesalib/src/glsl/glcpp/glcpp-lex.l b/mesalib/src/glsl/glcpp/glcpp-lex.l
index 576e53c44..596c6db70 100644
--- a/mesalib/src/glsl/glcpp/glcpp-lex.l
+++ b/mesalib/src/glsl/glcpp/glcpp-lex.l
@@ -34,6 +34,10 @@
 int glcpp_get_column  (yyscan_t yyscanner);

 void glcpp_set_column (int  column_no , yyscan_t yyscanner);

 

+#ifdef _MSC_VER

+#define YY_NO_UNISTD_H

+#endif

+

 #define YY_NO_INPUT

 

 #define YY_USER_ACTION                                          \

diff --git a/mesalib/src/glsl/glcpp/glcpp.c b/mesalib/src/glsl/glcpp/glcpp.c
index 62065481c..fd602c1fb 100644
--- a/mesalib/src/glsl/glcpp/glcpp.c
+++ b/mesalib/src/glsl/glcpp/glcpp.c
@@ -1,139 +1,129 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include "glcpp.h"
-#include "main/mtypes.h"
-#include "main/shaderobj.h"
-
-#ifdef _MSC_VER
-#include <io.h>
-#define STDIN_FILENO 0
-#define read _read
-#define open _open
-#define close _close
-#endif
-
-extern int yydebug;
-
-void
-_mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr,
-                       struct gl_shader *sh)
-{
-   *ptr = sh;
-}
-
-/* Read from fd until EOF and return a string of everything read.
- */
-static char *
-load_text_fd (void *ctx, int fd)
-{
-#define CHUNK 4096
-	char *text = NULL;
-	ssize_t text_size = 0;
-	ssize_t total_read = 0;
-	ssize_t bytes;
-
-	while (1) {
-		if (total_read + CHUNK + 1 > text_size) {
-			text_size = text_size ? text_size * 2 : CHUNK + 1;
-			text = reralloc_size (ctx, text, text_size);
-			if (text == NULL) {
-				fprintf (stderr, "Out of memory\n");
-				return NULL;
-			}
-		}
-		bytes = read (fd, text + total_read, CHUNK);
-		if (bytes < 0) {
-			fprintf (stderr, "Error while reading: %s\n",
-				 strerror (errno));
-			ralloc_free (text);
-			return NULL;
-		}
-
-		if (bytes == 0) {
-			break;
-		}
-
-		total_read += bytes;
-	}
-
-	text[total_read] = '\0';
-
-	return text;
-}
-
-static char *
-load_text_file(void *ctx, const char *filename)
-{
-	char *text;
-	int fd;
-
-	if (filename == NULL || strcmp (filename, "-") == 0)
-		return load_text_fd (ctx, STDIN_FILENO);
-
-	fd = open (filename, O_RDONLY);
-	if (fd < 0) {
-		fprintf (stderr, "Failed to open file %s: %s\n",
-			 filename, strerror (errno));
-		return NULL;
-	}
-
-	text = load_text_fd (ctx, fd);
-
-	close(fd);
-
-	return text;
-}
-
-int
-main (int argc, char *argv[])
-{
-	char *filename = NULL;
-	void *ctx = ralloc(NULL, void*);
-	char *info_log = ralloc_strdup(ctx, "");
-	const char *shader;
-	int ret;
-
-	if (argc) {
-		filename = argv[1];
-	}
-
-	shader = load_text_file (ctx, filename);
-	if (shader == NULL)
-	   return 1;
-
-	ret = preprocess(ctx, &shader, &info_log, NULL, API_OPENGL);
-
-	printf("%s", shader);
-	fprintf(stderr, "%s", info_log);
-
-	ralloc_free(ctx);
-
-	return ret;
-}
+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice (including the next

+ * paragraph) shall be included in all copies or substantial portions of the

+ * Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+ * DEALINGS IN THE SOFTWARE.

+ */

+

+#include <stdio.h>

+#include <string.h>

+#include <errno.h>

+#include "glcpp.h"

+#include "main/mtypes.h"

+#include "main/shaderobj.h"

+

+#ifdef _MSC_VER

+#include <io.h>

+#define STDIN_FILENO 0

+#define read _read

+#define open _open

+#define close _close

+#endif

+

+extern int yydebug;

+

+void

+_mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr,

+                       struct gl_shader *sh)

+{

+   *ptr = sh;

+}

+

+/* Read from fp until EOF and return a string of everything read.

+ */

+static char *

+load_text_fp (void *ctx, FILE *fp)

+{

+#define CHUNK 4096

+	char *text = NULL;

+	size_t text_size = 0;

+	size_t total_read = 0;

+	size_t bytes;

+

+	while (1) {

+		if (total_read + CHUNK + 1 > text_size) {

+			text_size = text_size ? text_size * 2 : CHUNK + 1;

+			text = reralloc_size (ctx, text, text_size);

+			if (text == NULL) {

+				fprintf (stderr, "Out of memory\n");

+				return NULL;

+			}

+		}

+		bytes = fread (text + total_read, 1, CHUNK, fp);

+		total_read += bytes;

+

+		if (bytes < CHUNK) {

+			break;

+		}

+	}

+

+	text[total_read] = '\0';

+

+	return text;

+}

+

+static char *

+load_text_file(void *ctx, const char *filename)

+{

+	char *text;

+	FILE *fp;

+

+	if (filename == NULL || strcmp (filename, "-") == 0)

+		return load_text_fp (ctx, stdin);

+

+	fp = fopen (filename, "r");

+	if (fp == NULL) {

+		fprintf (stderr, "Failed to open file %s: %s\n",

+			 filename, strerror (errno));

+		return NULL;

+	}

+

+	text = load_text_fp (ctx, fp);

+

+	fclose(fp);

+

+	return text;

+}

+

+int

+main (int argc, char *argv[])

+{

+	char *filename = NULL;

+	void *ctx = ralloc(NULL, void*);

+	char *info_log = ralloc_strdup(ctx, "");

+	const char *shader;

+	int ret;

+

+	if (argc) {

+		filename = argv[1];

+	}

+

+	shader = load_text_file (ctx, filename);

+	if (shader == NULL)

+	   return 1;

+

+	ret = preprocess(ctx, &shader, &info_log, NULL, API_OPENGL);

+

+	printf("%s", shader);

+	fprintf(stderr, "%s", info_log);

+

+	ralloc_free(ctx);

+

+	return ret;

+}