X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fexpressions%2Fprivate.h;h=92adef85b3f401429964ba808c3fa3d3c24c1360;hb=9f93ff4fb4b1836b6ead55d84476fbd39530764c;hp=5deb8b369eb2cafbf97c8f3efcc3d1ea1a182a0a;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp diff --git a/src/language/expressions/private.h b/src/language/expressions/private.h index 5deb8b369e..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,11 +19,11 @@ #include #include -#include -#include -#include "public.h" +#include "data/format.h" #include "operations.h" +#include "public.h" +#include "libpspp/str.h" enum operation_flags { @@ -187,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,