Update all #include directives to the currently preferred style.

[pspp-builds.git] / src / language / stats / aggregate.h

diff --git a/src/language/stats/aggregate.h b/src/language/stats/aggregate.h
index 95e574a0975e00762f38163b4ae75c26cbc3b57c..8cddbcfa574120a20d326732079f3f849f070e34 100644 (file)
--- a/src/language/stats/aggregate.h
+++ b/src/language/stats/aggregate.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010, 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
@@ -18,11 +18,11 @@
 #ifndef AGGREGATE_H
 #define AGGREGATE_H
 
-#include <data/format.h>
-#include <data/val-type.h>
-
 #include <stddef.h>
 
+#include "data/format.h"
+#include "data/val-type.h"
+
 enum agr_src_vars
   {
     AGR_SV_NO,
@@ -30,6 +30,16 @@ enum agr_src_vars
     AGR_SV_OPT
   };
 
+/* Aggregation functions. */
+enum
+  {
+    SUM, MEAN, MEDIAN, SD, MAX, MIN, PGT, PLT, PIN, POUT, FGT, FLT, FIN,
+    FOUT, N, NU, NMISS, NUMISS, FIRST, LAST,
+
+    FUNC = 0x1f, /* Function mask. */
+    FSTRING = 1<<5, /* String function bit. */
+  };
+
 /* Attributes of an aggregation function. */
 struct agr_func
   {