X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fmsg-locator.c;h=d29f35db9375cca79dfe6a572f0ad55fd87fd15f;hb=afdf3096926b561f4e6511c10fcf73fc6796b9d2;hp=3e915382739515a6980b2d8611f7fc58cd8ae438;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp-builds.git
diff --git a/src/libpspp/msg-locator.c b/src/libpspp/msg-locator.c
index 3e915382..d29f35db 100644
--- a/src/libpspp/msg-locator.c
+++ b/src/libpspp/msg-locator.c
@@ -1,5 +1,5 @@
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2011 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,12 +15,17 @@
along with this program. If not, see . */
#include
+
+#include "libpspp/msg-locator.h"
+
#include
-#include
-#include "msg-locator.h"
-#include
-#include
-#include "getl.h"
+
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "libpspp/message.h"
+#include "libpspp/getl.h"
+
+#include "gl/xalloc.h"
/* File locator stack. */
static const struct msg_locator **file_loc;
@@ -76,7 +81,7 @@ get_msg_location (const struct source_stream *ss, struct msg_locator *loc)
}
else
{
- loc->file_name = getl_source_name (ss);
+ loc->file_name = CONST_CAST (char *, getl_source_name (ss));
loc->line_number = getl_source_location (ss);
}
}