X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fexpressions%2Fprivate.h;h=92adef85b3f401429964ba808c3fa3d3c24c1360;hb=bf3af6fb69dc94a6b3010e11e5d359e9e4abd5ba;hp=4283b4ae694236d6118eb48c9890cfc26b70fd5c;hpb=392ab4052e2743f80664a4130b2b4ee5d82af7fe;p=pspp diff --git a/src/language/expressions/private.h b/src/language/expressions/private.h index 4283b4ae69..92adef85b3 100644 --- a/src/language/expressions/private.h +++ b/src/language/expressions/private.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 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 @@ -19,12 +19,11 @@ #include #include -#include -#include "public.h" +#include "data/format.h" #include "operations.h" - -#include +#include "public.h" +#include "libpspp/str.h" enum operation_flags { @@ -188,10 +187,7 @@ union any_node *expr_allocate_number (struct expression *e, double); union any_node *expr_allocate_boolean (struct expression *e, double); union any_node *expr_allocate_integer (struct expression *e, int); union any_node *expr_allocate_pos_int (struct expression *e, int); -union any_node *expr_allocate_string_buffer (struct expression *e, - const char *string, size_t length); -union any_node *expr_allocate_string (struct expression *e, - struct substring); +union any_node *expr_allocate_string (struct expression *e, struct substring); union any_node *expr_allocate_variable (struct expression *e, const struct variable *); union any_node *expr_allocate_format (struct expression *e,