Adopt use of gnulib for portability.

[pspp-builds.git] / src / frequencies.q

diff --git a/src/frequencies.q b/src/frequencies.q
index b5da79bde62b83545e563e5bbd0fde8a5bde8171..c165c21d6926bf2dbe6468f8ce55ec69c23ba4b7 100644 (file)
--- a/src/frequencies.q
+++ b/src/frequencies.q
@@ -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
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 /*
   TODO:
@@ -51,6 +51,11 @@
 #include "vfm.h"
 #include "settings.h"
 #include "chart.h"
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
 /* (headers) */
 
 #include "debug-print.h"
@@ -627,7 +632,7 @@ postcalc (void *aux UNUSED)
        dump_statistics (v, !dumped_freq_tab);
 
 
-#ifndef NO_CHARTS
+
       if ( chart == GFT_HIST) 
        {
          double d[frq_n_stats];
@@ -653,7 +658,7 @@ postcalc (void *aux UNUSED)
        {
          do_piechart(v_variables[i], ft);
        }
-#endif
+
 
 
       cleanup_freq_tab (v);
@@ -702,7 +707,7 @@ postprocess_freq_tab (struct variable *v)
   hsh_compare_func *compare;
   struct freq_tab *ft;
   size_t count;
-  void **data;
+  void *const *data;
   struct freq *freqs, *f;
   size_t i;
 
@@ -868,7 +873,7 @@ frq_custom_grouped (struct cmd_frequencies *cmd UNUSED)
          {
            nl = ml = 0;
            dl = NULL;
-           while (token == T_NUM)
+           while (lex_integer ())
              {
                if (nl >= ml)
                  {
@@ -1614,7 +1619,7 @@ freq_tab_to_slice_array(const struct freq_tab *frq_tab,
 
 
 
-#ifndef NO_CHARTS
+
 static void
 do_piechart(const struct variable *var, const struct freq_tab *frq_tab)
 {
@@ -1627,7 +1632,7 @@ do_piechart(const struct variable *var, const struct freq_tab *frq_tab)
 
   free(slices);
 }
-#endif
+
 
 /* 
    Local Variables: