diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-04-01 12:28:56 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-04-01 12:28:56 +0200 |
| commit | be20eef52da4b7f361333ea70a8d705a98ae779e (patch) | |
| tree | 4177a110ce6b1335fc4b85d5e53b298a65661f39 /test/libapt/getlistoffilesindir_test.cc | |
| parent | a555cf8be53d8b5557f004ecbde8482a169b79f3 (diff) | |
| parent | 21b3eac8f9ab8e12b43fa8998a5aa5465f29adc5 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into feature/apt-manpage
Conflicts:
cmdline/apt.cc
Diffstat (limited to 'test/libapt/getlistoffilesindir_test.cc')
| -rw-r--r-- | test/libapt/getlistoffilesindir_test.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/libapt/getlistoffilesindir_test.cc b/test/libapt/getlistoffilesindir_test.cc index b2c95e840..df125fc83 100644 --- a/test/libapt/getlistoffilesindir_test.cc +++ b/test/libapt/getlistoffilesindir_test.cc @@ -1,12 +1,13 @@ +#include <config.h> + #include <apt-pkg/fileutl.h> -#include "assert.h" #include <string> #include <vector> - -#include <stdio.h> #include <iostream> +#include "assert.h" + #define P(x) std::string(argv[1]).append("/").append(x) int main(int argc,char *argv[]) |