diff options
| author | Chase Douglas <chase.douglas@canonical.com> | 2012-05-18 13:16:25 -0700 |
|---|---|---|
| committer | Chase Douglas <chase.douglas@canonical.com> | 2012-05-18 13:21:12 -0700 |
| commit | d5bc8f147f25f4a5aff8011a2ea542ddd606df23 (patch) | |
| tree | 1a12760cf2494fe83f3cdfca1220d17b2b802953 /include | |
| parent | 5b0320cf21aa64d6359319f95194efd60288c924 (diff) | |
Namespace xorg-gtest header filenames
Due to the default automake compilation flags including -I. -I.., it is
possible to pick up an xorg-gtest header like device.h instead of a
project header. Namespacing the headers should resolve this issue. Users
should be including xorg-gtest.h instead of individual headers, so this
should not cause compilation failures.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 8 | ||||
| -rw-r--r-- | include/xorg/gtest/evemu/xorg-gtest_device.h (renamed from include/xorg/gtest/evemu/device.h) | 0 | ||||
| -rw-r--r-- | include/xorg/gtest/xorg-gtest.h | 8 | ||||
| -rw-r--r-- | include/xorg/gtest/xorg-gtest_environment.h (renamed from include/xorg/gtest/environment.h) | 0 | ||||
| -rw-r--r-- | include/xorg/gtest/xorg-gtest_process.h (renamed from include/xorg/gtest/process.h) | 0 | ||||
| -rw-r--r-- | include/xorg/gtest/xorg-gtest_test.h (renamed from include/xorg/gtest/test.h) | 0 |
6 files changed, 8 insertions, 8 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 0256685..6b39d0b 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -24,8 +24,8 @@ # nobase_include_HEADERS = \ - xorg/gtest/environment.h \ - xorg/gtest/process.h \ - xorg/gtest/test.h \ - xorg/gtest/evemu/device.h \ + xorg/gtest/xorg-gtest_environment.h \ + xorg/gtest/xorg-gtest_process.h \ + xorg/gtest/xorg-gtest_test.h \ + xorg/gtest/evemu/xorg-gtest_device.h \ xorg/gtest/xorg-gtest.h diff --git a/include/xorg/gtest/evemu/device.h b/include/xorg/gtest/evemu/xorg-gtest_device.h index 4e456ce..4e456ce 100644 --- a/include/xorg/gtest/evemu/device.h +++ b/include/xorg/gtest/evemu/xorg-gtest_device.h diff --git a/include/xorg/gtest/xorg-gtest.h b/include/xorg/gtest/xorg-gtest.h index 5568185..deb2ad7 100644 --- a/include/xorg/gtest/xorg-gtest.h +++ b/include/xorg/gtest/xorg-gtest.h @@ -25,10 +25,10 @@ * ******************************************************************************/ -#include "environment.h" -#include "process.h" -#include "test.h" +#include "xorg-gtest_environment.h" +#include "xorg-gtest_process.h" +#include "xorg-gtest_test.h" #ifdef HAVE_EVEMU -#include "evemu/device.h" +#include "evemu/xorg-gtest_device.h" #endif diff --git a/include/xorg/gtest/environment.h b/include/xorg/gtest/xorg-gtest_environment.h index e113cd7..e113cd7 100644 --- a/include/xorg/gtest/environment.h +++ b/include/xorg/gtest/xorg-gtest_environment.h diff --git a/include/xorg/gtest/process.h b/include/xorg/gtest/xorg-gtest_process.h index d7e1143..d7e1143 100644 --- a/include/xorg/gtest/process.h +++ b/include/xorg/gtest/xorg-gtest_process.h diff --git a/include/xorg/gtest/test.h b/include/xorg/gtest/xorg-gtest_test.h index 093890b..093890b 100644 --- a/include/xorg/gtest/test.h +++ b/include/xorg/gtest/xorg-gtest_test.h |