Update all #include directives to the currently preferred style.

[pspp-builds.git] / src / libpspp / model-checker.c

diff --git a/src/libpspp/model-checker.c b/src/libpspp/model-checker.c
index 80198f82bc76262b60b2841be92a25e8ce1cc648..e0a0f71a62706891145c01966d4dacff94530d53 100644 (file)
--- a/src/libpspp/model-checker.c
+++ b/src/libpspp/model-checker.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 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
@@ -16,7 +16,7 @@
 
 #include <config.h>
 
-#include <libpspp/model-checker.h>
+#include "libpspp/model-checker.h"
 
 #include <limits.h>
 #include <signal.h>
@@ -26,16 +26,16 @@
 #include <string.h>
 #include <sys/time.h>
 
-#include <libpspp/argv-parser.h>
-#include <libpspp/bit-vector.h>
-#include <libpspp/compiler.h>
-#include <libpspp/deque.h>
-#include <libpspp/misc.h>
-#include <libpspp/str.h>
+#include "libpspp/argv-parser.h"
+#include "libpspp/bit-vector.h"
+#include "libpspp/compiler.h"
+#include "libpspp/deque.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
 
-#include "error.h"
-#include "minmax.h"
-#include "xalloc.h"
+#include "gl/error.h"
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 \f
 /* Initializes PATH as an empty path. */
 void
@@ -120,7 +120,7 @@ mc_path_to_string (const struct mc_path *path, struct string *string)
   for (i = 0; i < mc_path_get_length (path); i++)
     {
       if (i > 0)
-        ds_put_char (string, ' ');
+        ds_put_byte (string, ' ');
       ds_put_format (string, "%d", mc_path_get_operation (path, i));
     }
 }
@@ -707,7 +707,7 @@ mc_parser_option_callback (int id, void *mc_options_)
         mc_options_set_strategy (options, MC_RANDOM);
       else
         error (1, 0,
-               "strategy must be \"broad\", \"deep\", or \"random\"");
+               "strategy must be `broad', `deep', or `random'");
       break;
 
     case OPT_MAX_DEPTH:
@@ -756,8 +756,8 @@ mc_parser_option_callback (int id, void *mc_options_)
       else if (!strcmp (optarg, "random"))
         mc_options_set_queue_limit_strategy (options, MC_DROP_RANDOM);
       else
-        error (1, 0, "--queue-drop argument must be \"newest\", "
-               "\"oldest\", or \"random\"");
+        error (1, 0, "--queue-drop argument must be `newest' "
+               "`oldest' or `random'");
       break;
 
     case OPT_SEED: