X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fmsg-locator.c;h=d29f35db9375cca79dfe6a572f0ad55fd87fd15f;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=09550e29ac9c802def722eb8269d50efb9ab726d;hpb=9f087e7aa4cdff1d5d46d5e188c0017a9d2d0029;p=pspp-builds.git diff --git a/src/libpspp/msg-locator.c b/src/libpspp/msg-locator.c index 09550e29..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,13 +15,17 @@ along with this program. If not, see . */ #include + +#include "libpspp/msg-locator.h" + #include -#include "msg-locator.h" -#include -#include -#include "getl.h" -#include "xalloc.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; @@ -77,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); } }