diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-08-20 17:42:53 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-08-20 17:42:53 +1000 |
| commit | 0f3f8f68f87233bf59c3fa68c3dfe1f492a1a478 (patch) | |
| tree | 3dc625e7dfcfc620e83827ccd18423be1b5334f4 /src/gdisp/sys_defs.h | |
| parent | fcbb66a9394eaf4059bc942df6729b4b55a057d8 (diff) | |
| download | uGFX-0f3f8f68f87233bf59c3fa68c3dfe1f492a1a478.tar.gz uGFX-0f3f8f68f87233bf59c3fa68c3dfe1f492a1a478.tar.bz2 uGFX-0f3f8f68f87233bf59c3fa68c3dfe1f492a1a478.zip | |
Rename lots of files to help prevent compile time name conflicts.
Diffstat (limited to 'src/gdisp/sys_defs.h')
| -rw-r--r-- | src/gdisp/sys_defs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gdisp/sys_defs.h b/src/gdisp/sys_defs.h index 72fdc621..253de49e 100644 --- a/src/gdisp/sys_defs.h +++ b/src/gdisp/sys_defs.h @@ -185,7 +185,7 @@ extern GDisplay *GDISP; /*===========================================================================*/ /* Load our color definitions and pixel formats */ -#include "colors.h" +#include "gdisp_colors.h" /** * @brief The type of a pixel. @@ -995,7 +995,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co #endif #if GDISP_NEED_IMAGE || defined(__DOXYGEN__) - #include "src/gdisp/image.h" + #include "gdisp_image.h" #endif #endif /* GFX_USE_GDISP */ |