projects
/
pspp-builds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1a91de1
)
Remove various duplicated #include directives
author
John Darrington
<john@darrington.wattle.id.au>
Mon, 25 Oct 2010 09:30:28 +0000
(11:30 +0200)
committer
John Darrington
<john@darrington.wattle.id.au>
Mon, 25 Oct 2010 09:30:28 +0000
(11:30 +0200)
18 files changed:
glade/dialog.c
patch
|
blob
|
history
src/data/gnumeric-reader.c
patch
|
blob
|
history
src/language/data-io/file-handle.q
patch
|
blob
|
history
src/language/data-io/inpt-pgm.c
patch
|
blob
|
history
src/language/dictionary/missing-values.c
patch
|
blob
|
history
src/language/dictionary/sys-file-info.c
patch
|
blob
|
history
src/language/lexer/lexer.c
patch
|
blob
|
history
src/language/prompt.c
patch
|
blob
|
history
src/language/stats/examine.q
patch
|
blob
|
history
src/language/syntax-file.c
patch
|
blob
|
history
src/language/utilities/permissions.c
patch
|
blob
|
history
src/language/xforms/count.c
patch
|
blob
|
history
src/libpspp/array.c
patch
|
blob
|
history
src/libpspp/hash.c
patch
|
blob
|
history
src/libpspp/ll.h
patch
|
blob
|
history
src/ui/gui/psppire-syntax-window.c
patch
|
blob
|
history
src/ui/gui/psppire.c
patch
|
blob
|
history
src/ui/gui/variable-info-dialog.c
patch
|
blob
|
history
diff --git
a/glade/dialog.c
b/glade/dialog.c
index 3596e3485f00bc411ae2418fdbc5aa5dec503a9f..09330bd787955de63a4c5ccff9bce47321e716e7 100644
(file)
--- a/
glade/dialog.c
+++ b/
glade/dialog.c
@@
-4,7
+4,6
@@
#include "psppire-dialog.h"
#include <string.h>
#include <assert.h>
#include "psppire-dialog.h"
#include <string.h>
#include <assert.h>
-#include <string.h>
#include <gladeui/glade.h>
#include <gladeui/glade.h>
diff --git
a/src/data/gnumeric-reader.c
b/src/data/gnumeric-reader.c
index 26b90ee8916377d500512b1145422bff1fd9a1d1..64b29b76fbbf0d4d44e20931e0f1647342e0aeb3 100644
(file)
--- a/
src/data/gnumeric-reader.c
+++ b/
src/data/gnumeric-reader.c
@@
-40,25
+40,26
@@
gnumeric_open_reader (struct gnumeric_read_info *gri, struct dictionary **dict)
#else
#else
-#include <data/casereader-provider.h>
+#include <assert.h>
+#include <stdbool.h>
#include <errno.h>
#include <errno.h>
-#include <libpspp/str.h>
-#include <libpspp/i18n.h>
-#include <data/dictionary.h>
-#include <data/variable.h>
+
#include <xalloc.h>
#include <xalloc.h>
-#include <errno.h>
#include <libxml/xmlreader.h>
#include <zlib.h>
#include <libxml/xmlreader.h>
#include <zlib.h>
-#include <stdbool.h>
#include <data/case.h>
#include <data/case.h>
+#include <data/casereader-provider.h>
+#include <data/dictionary.h>
+#include <data/identifier.h>
+#include <data/variable.h>
#include <data/value.h>
#include <data/value.h>
+#include <libpspp/i18n.h>
+#include <libpspp/str.h>
+
#include "gnumeric-reader.h"
#include "gnumeric-reader.h"
-#include <data/identifier.h>
-#include <assert.h>
/* Default width of string variables. */
#define GNUMERIC_DEFAULT_WIDTH 8
/* Default width of string variables. */
#define GNUMERIC_DEFAULT_WIDTH 8
diff --git
a/src/language/data-io/file-handle.q
b/src/language/data-io/file-handle.q
index 71081b922ac0601835fec8b13a819aa4f2a17dc3..c29a5fedd0374d011355fe0306bbfe1a6849aadf 100644
(file)
--- a/
src/language/data-io/file-handle.q
+++ b/
src/language/data-io/file-handle.q
@@
-15,13
+15,13
@@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
+
#include <limits.h>
#include <limits.h>
-#include <language/data-io/file-handle.h>
-#include <libpspp/message.h>
#include <errno.h>
#include <stdlib.h>
#include <data/file-name.h>
#include <language/command.h>
#include <errno.h>
#include <stdlib.h>
#include <data/file-name.h>
#include <language/command.h>
+#include <language/data-io/file-handle.h>
#include <language/lexer/lexer.h>
#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include <language/lexer/lexer.h>
#include <libpspp/assertion.h>
#include <libpspp/message.h>
diff --git
a/src/language/data-io/inpt-pgm.c
b/src/language/data-io/inpt-pgm.c
index 8cadb94b1e31d9ba5bdbdbef5810e1a0423166d6..eada5cdd9e589f741c30abb5726201de7e1d61d7 100644
(file)
--- a/
src/language/data-io/inpt-pgm.c
+++ b/
src/language/data-io/inpt-pgm.c
@@
-16,7
+16,6
@@
#include <config.h>
#include <config.h>
-#include <language/data-io/inpt-pgm.h>
#include <float.h>
#include <stdlib.h>
#include <float.h>
#include <stdlib.h>
@@
-31,12
+30,12
@@
#include <language/command.h>
#include <language/data-io/data-reader.h>
#include <language/data-io/file-handle.h>
#include <language/command.h>
#include <language/data-io/data-reader.h>
#include <language/data-io/file-handle.h>
+#include <language/data-io/inpt-pgm.h>
#include <language/expressions/public.h>
#include <language/lexer/lexer.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
#include <language/expressions/public.h>
#include <language/lexer/lexer.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
-#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
diff --git
a/src/language/dictionary/missing-values.c
b/src/language/dictionary/missing-values.c
index 912c58cf5a0bdee053d7adc9adb86ab2cc4d5105..455f1cc38eac75fa0590faefb6a345b555e14b24 100644
(file)
--- a/
src/language/dictionary/missing-values.c
+++ b/
src/language/dictionary/missing-values.c
@@
-29,7
+29,6
@@
#include <language/lexer/value-parser.h>
#include <language/lexer/variable-parser.h>
#include <libpspp/message.h>
#include <language/lexer/value-parser.h>
#include <language/lexer/variable-parser.h>
#include <libpspp/message.h>
-#include <libpspp/message.h>
#include <libpspp/str.h>
#include "gettext.h"
#include <libpspp/str.h>
#include "gettext.h"
diff --git
a/src/language/dictionary/sys-file-info.c
b/src/language/dictionary/sys-file-info.c
index 24130cbc30abfa4830aff59ff96f7023cd2284d1..fe24953ae80b33d484b7171617b5210dfcea0000 100644
(file)
--- a/
src/language/dictionary/sys-file-info.c
+++ b/
src/language/dictionary/sys-file-info.c
@@
-36,7
+36,6
@@
#include <language/lexer/variable-parser.h>
#include <libpspp/array.h>
#include <libpspp/message.h>
#include <language/lexer/variable-parser.h>
#include <libpspp/array.h>
#include <libpspp/message.h>
-#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <output/tab.h>
#include <libpspp/misc.h>
#include <output/tab.h>
diff --git
a/src/language/lexer/lexer.c
b/src/language/lexer/lexer.c
index 87fecaa6a92a8281b17df37ada52f7c9addb33fa..8d0352ae8ab88ad0c3cf309d765c2b56fe01ae7e 100644
(file)
--- a/
src/language/lexer/lexer.c
+++ b/
src/language/lexer/lexer.c
@@
-15,8
+15,8
@@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
+
#include "lexer.h"
#include "lexer.h"
-#include <libpspp/message.h>
#include <c-ctype.h>
#include <c-strtod.h>
#include <errno.h>
#include <c-ctype.h>
#include <c-strtod.h>
#include <errno.h>
@@
-25,11
+25,11
@@
#include <stdarg.h>
#include <stdint.h>
#include <stdlib.h>
#include <stdarg.h>
#include <stdint.h>
#include <stdlib.h>
-#include <libpspp/assertion.h>
#include <language/command.h>
#include <language/command.h>
-#include <libpspp/message.h>
#include <data/settings.h>
#include <data/settings.h>
+#include <libpspp/assertion.h>
#include <libpspp/getl.h>
#include <libpspp/getl.h>
+#include <libpspp/message.h>
#include <libpspp/str.h>
#include <output/journal.h>
#include <output/text-item.h>
#include <libpspp/str.h>
#include <output/journal.h>
#include <output/text-item.h>
diff --git
a/src/language/prompt.c
b/src/language/prompt.c
index ede6a5e3b9c8c76d5b5d249113bc2537e3cff82d..b527807875b897d17c1d2ff662932978cbf2f74e 100644
(file)
--- a/
src/language/prompt.c
+++ b/
src/language/prompt.c
@@
-29,7
+29,6
@@
#include <language/lexer/lexer.h>
#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include <language/lexer/lexer.h>
#include <libpspp/assertion.h>
#include <libpspp/message.h>
-#include <libpspp/message.h>
#include <libpspp/str.h>
#include <libpspp/version.h>
#include <output/tab.h>
#include <libpspp/str.h>
#include <libpspp/version.h>
#include <output/tab.h>
diff --git
a/src/language/stats/examine.q
b/src/language/stats/examine.q
index e4239fda6adbbd45695b4350c93e64f7a51ade9b..090d5835db9c10db80d9451f4902a935a253ee84 100644
(file)
--- a/
src/language/stats/examine.q
+++ b/
src/language/stats/examine.q
@@
-17,7
+17,6
@@
#include <config.h>
#include <gsl/gsl_cdf.h>
#include <config.h>
#include <gsl/gsl_cdf.h>
-#include <libpspp/message.h>
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
diff --git
a/src/language/syntax-file.c
b/src/language/syntax-file.c
index 83bd07b351b9cb2ee9f270ce3eed1534b6ad5982..97f73fd6fca44f344a163be35038d7d77aa55754 100644
(file)
--- a/
src/language/syntax-file.c
+++ b/
src/language/syntax-file.c
@@
-31,7
+31,6
@@
#include <libpspp/assertion.h>
#include <libpspp/cast.h>
#include <libpspp/message.h>
#include <libpspp/assertion.h>
#include <libpspp/cast.h>
#include <libpspp/message.h>
-#include <libpspp/message.h>
#include <libpspp/str.h>
#include <libpspp/version.h>
#include <output/tab.h>
#include <libpspp/str.h>
#include <libpspp/version.h>
#include <output/tab.h>
diff --git
a/src/language/utilities/permissions.c
b/src/language/utilities/permissions.c
index 967b1bd2a1c314cca681dd78516084fd30921994..1de2175a47f121ea0feccdc0e5126906ff677adc 100644
(file)
--- a/
src/language/utilities/permissions.c
+++ b/
src/language/utilities/permissions.c
@@
-15,7
+15,7
@@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
-#include <libpspp/message.h>
+
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git
a/src/language/xforms/count.c
b/src/language/xforms/count.c
index 4fb889b17717ae3a0dec8bc98ee5a81ea6e219b9..be6c0b9701de143a8b7d85a92165c84fb1326634 100644
(file)
--- a/
src/language/xforms/count.c
+++ b/
src/language/xforms/count.c
@@
-29,7
+29,6
@@
#include <language/lexer/variable-parser.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
#include <language/lexer/variable-parser.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
-#include <libpspp/message.h>
#include <libpspp/pool.h>
#include <libpspp/str.h>
#include <libpspp/pool.h>
#include <libpspp/str.h>
diff --git
a/src/libpspp/array.c
b/src/libpspp/array.c
index b1b4ee524562e4335b275ddbbb0072b1e4312667..f82bce913012bb3f7e30cb816713428021e4faa6 100644
(file)
--- a/
src/libpspp/array.c
+++ b/
src/libpspp/array.c
@@
-84,7
+84,9
@@
<http://www.gnu.org/licenses/>. */
#include <config.h>
<http://www.gnu.org/licenses/>. */
#include <config.h>
+
#include "array.h"
#include "array.h"
+
#include <limits.h>
#include <stdlib.h>
#include <string.h>
#include <limits.h>
#include <stdlib.h>
#include <string.h>
diff --git
a/src/libpspp/hash.c
b/src/libpspp/hash.c
index 9101d1f19eea6574e6a659c94b19b6b4780f9158..f2d99e3a8f31204d9a93d48cc1208695bff78713 100644
(file)
--- a/
src/libpspp/hash.c
+++ b/
src/libpspp/hash.c
@@
-15,18
+15,18
@@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
-#include <stdbool.h>
-#include "hash.h"
-#include "message.h"
+
#include <assert.h>
#include <limits.h>
#include <stdbool.h>
#include <stdlib.h>
#include <assert.h>
#include <limits.h>
#include <stdbool.h>
#include <stdlib.h>
+
#include "array.h"
#include "compiler.h"
#include "array.h"
#include "compiler.h"
+#include "hash.h"
#include "misc.h"
#include "misc.h"
-#include "str.h"
#include "pool.h"
#include "pool.h"
+#include "str.h"
#include "xalloc.h"
#include "xalloc.h"
diff --git
a/src/libpspp/ll.h
b/src/libpspp/ll.h
index bf871f6b0f842a0a42726de48364aad08ea4d3ea..f59736f1e71c7d3d88990f4a8702405558abe8cf 100644
(file)
--- a/
src/libpspp/ll.h
+++ b/
src/libpspp/ll.h
@@
-52,8
+52,6
@@
#include <stddef.h>
#include <libpspp/cast.h>
#include <stddef.h>
#include <libpspp/cast.h>
-#include <libpspp/cast.h>
-
/* Embedded, circular doubly linked list.
Each list contains a single "null" element that separates the
/* Embedded, circular doubly linked list.
Each list contains a single "null" element that separates the
diff --git
a/src/ui/gui/psppire-syntax-window.c
b/src/ui/gui/psppire-syntax-window.c
index ccf94e7bf2f0298b7f38c9ca95b07905f744e07c..1d78881904f3ef52239c303e419c5eea2a6f7f28 100644
(file)
--- a/
src/ui/gui/psppire-syntax-window.c
+++ b/
src/ui/gui/psppire-syntax-window.c
@@
-21,19
+21,16
@@
#include "executor.h"
#include "helper.h"
#include "executor.h"
#include "helper.h"
+#include <language/lexer/lexer.h>
#include <libpspp/message.h>
#include <stdlib.h>
#include <libpspp/message.h>
#include <stdlib.h>
+#include "help-menu.h"
#include "psppire.h"
#include "psppire.h"
-#include "psppire-syntax-window.h"
-
#include "psppire-data-window.h"
#include "psppire-window-register.h"
#include "psppire-data-window.h"
#include "psppire-window-register.h"
-#include "psppire.h"
-#include "help-menu.h"
#include "psppire-syntax-window.h"
#include "syntax-editor-source.h"
#include "psppire-syntax-window.h"
#include "syntax-editor-source.h"
-#include <language/lexer/lexer.h>
#include "xalloc.h"
#include "xalloc.h"
diff --git
a/src/ui/gui/psppire.c
b/src/ui/gui/psppire.c
index 61042efe546cdedaf59470764312c6fa5e817361..621814cd9239163731f9c690157a52a221418a94 100644
(file)
--- a/
src/ui/gui/psppire.c
+++ b/
src/ui/gui/psppire.c
@@
-16,8
+16,6
@@
#include <config.h>
#include <config.h>
-#include "ui/gui/psppire.h"
-
#include <assert.h>
#include <gsl/gsl_errno.h>
#include <gtk/gtk.h>
#include <assert.h>
#include <gsl/gsl_errno.h>
#include <gtk/gtk.h>
@@
-32,15
+30,19
@@
#include "data/procedure.h"
#include "data/settings.h"
#include "data/sys-file-reader.h"
#include "data/procedure.h"
#include "data/settings.h"
#include "data/sys-file-reader.h"
+
#include "language/lexer/lexer.h"
#include "language/syntax-string-source.h"
#include "language/lexer/lexer.h"
#include "language/syntax-string-source.h"
+
#include "libpspp/getl.h"
#include "libpspp/i18n.h"
#include "libpspp/message.h"
#include "libpspp/version.h"
#include "libpspp/getl.h"
#include "libpspp/i18n.h"
#include "libpspp/message.h"
#include "libpspp/version.h"
+
#include "output/driver.h"
#include "output/journal.h"
#include "output/message-item.h"
#include "output/driver.h"
#include "output/journal.h"
#include "output/message-item.h"
+
#include "ui/gui/dict-display.h"
#include "ui/gui/executor.h"
#include "ui/gui/psppire-data-store.h"
#include "ui/gui/dict-display.h"
#include "ui/gui/executor.h"
#include "ui/gui/psppire-data-store.h"
diff --git
a/src/ui/gui/variable-info-dialog.c
b/src/ui/gui/variable-info-dialog.c
index 521864f417c6cd041570a705c91d6638bbe570ac..16a5f462945e2c957ee7a783f1c93f58723b3143 100644
(file)
--- a/
src/ui/gui/variable-info-dialog.c
+++ b/
src/ui/gui/variable-info-dialog.c
@@
-17,20
+17,21
@@
#include <config.h>
#include <gtk/gtk.h>
#include <config.h>
#include <gtk/gtk.h>
-#include "variable-info-dialog.h"
-#include "var-display.h"
#include <data/variable.h>
#include <data/format.h>
#include <data/value-labels.h>
#include <data/variable.h>
#include <data/format.h>
#include <data/value-labels.h>
+#include <language/syntax-string-source.h>
+#include <libpspp/i18n.h>
+
+#include "variable-info-dialog.h"
+#include "var-display.h"
+
#include "psppire-data-window.h"
#include "psppire-dialog.h"
#include "psppire-data-window.h"
#include "psppire-dialog.h"
-#include "psppire-var-store.h"
#include "psppire-dictview.h"
#include "psppire-dictview.h"
+#include "psppire-var-store.h"
#include "helper.h"
#include "helper.h"
-#include <language/syntax-string-source.h>
-#include <libpspp/i18n.h>
-#include "helper.h"
#include <gettext.h>
#include <gettext.h>