projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved EXPORT comments to new header file
[pspp]
/
src
/
temporary.c
diff --git
a/src/temporary.c
b/src/temporary.c
index c04ce764d99b18a99274fe2adfa9503f9f5854b7..840e5d2b4e73941b95242b5b1b65c7087dea974a 100644
(file)
--- a/
src/temporary.c
+++ b/
src/temporary.c
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 5
9 Temple Place - Suite 330
, Boston, MA
- 0211
1-1307
, USA. */
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor
, Boston, MA
+ 0211
0-1301
, USA. */
#include <config.h>
#include "error.h"
#include <config.h>
#include "error.h"
@@
-23,7
+23,8
@@
#include <stdlib.h>
#include "alloc.h"
#include "command.h"
#include <stdlib.h>
#include "alloc.h"
#include "command.h"
-#include "do-ifP.h"
+#include "dictionary.h"
+#include "ctl-stack.h"
#include "error.h"
#include "hash.h"
#include "lexer.h"
#include "error.h"
#include "hash.h"
#include "lexer.h"
@@
-31,16
+32,19
@@
#include "value-labels.h"
#include "var.h"
#include "value-labels.h"
#include "var.h"
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
int temporary;
struct dictionary *temp_dict;
int temporary;
struct dictionary *temp_dict;
-
in
t temp_trns;
+
size_
t temp_trns;
/* Parses the TEMPORARY command. */
int
cmd_temporary (void)
{
/* TEMPORARY is not allowed inside DO IF or LOOP. */
/* Parses the TEMPORARY command. */
int
cmd_temporary (void)
{
/* TEMPORARY is not allowed inside DO IF or LOOP. */
- if (
ctl_stack
)
+ if (
!ctl_stack_is_empty ()
)
{
msg (SE, _("This command is not valid inside DO IF or LOOP."));
return CMD_FAILURE;
{
msg (SE, _("This command is not valid inside DO IF or LOOP."));
return CMD_FAILURE;