diff options
| author | benl@chromium.org <benl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-07 16:39:46 +0000 |
|---|---|---|
| committer | benl@chromium.org <benl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-07 16:39:46 +0000 |
| commit | fb66f9deac79dfe9e0eedc184705e824ae9144c3 (patch) | |
| tree | 019f94cbb5f93009383182cffe8184009adcb6e6 /skia | |
| parent | ccf440ed5cf9f0a3368457c73a7496a900e03c06 (diff) | |
| download | chromium_src-fb66f9deac79dfe9e0eedc184705e824ae9144c3.zip chromium_src-fb66f9deac79dfe9e0eedc184705e824ae9144c3.tar.gz chromium_src-fb66f9deac79dfe9e0eedc184705e824ae9144c3.tar.bz2 | |
Added USE_GDK, set when either TOOLKIT_GTK or TOOLKIT_VIEWS is set but
not OS_WIN.
Added USE_X11. Set when OS_LINUX or OS_FREEBSD is set.
Added USE_BASE_DATA_PACK for base::DataPack usage, set for OS_MACOSX,
OS_LINUX or OS_FREEBSD.
Added USE_NSS for ... nss (for crypto). Windows and MacOS use
platform-specific libraries.
All of the above cause slightly odd formulations like:
#if defined(OS_WIN)
...
#elif defined(USE_BASE_DATA_PACK)
...
#endif
Possibly should also define USE_DLL_FOR_DATA, etc? Or something?
Wrapped various references to struct stat64 and stat64() to use struct
stat and stat() for FreeBSD - but a "man stat64" on Linux suggests
that we could do the same thing for at least Linux, too, and perhaps
eliminate the wrapper?
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25599 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/platform_canvas.h | 2 | ||||
| -rw-r--r-- | skia/ext/platform_device.h | 2 | ||||
| -rw-r--r-- | skia/skia.gyp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/skia/ext/platform_canvas.h b/skia/ext/platform_canvas.h index f16fa1f..a1a55c0 100644 --- a/skia/ext/platform_canvas.h +++ b/skia/ext/platform_canvas.h @@ -47,7 +47,7 @@ class PlatformCanvas : public SkCanvas { // For two-part init, call if you use the no-argument constructor above bool initialize(int width, int height, bool is_opaque, uint8_t* data = NULL); -#elif defined(__linux__) +#elif defined(__linux__) || defined(__FreeBSD__) // Linux --------------------------------------------------------------------- // Construct a canvas from the given memory region. The memory is not cleared diff --git a/skia/ext/platform_device.h b/skia/ext/platform_device.h index 00845ca..f54da7a 100644 --- a/skia/ext/platform_device.h +++ b/skia/ext/platform_device.h @@ -12,7 +12,7 @@ #include "skia/ext/platform_device_win.h" #elif defined(__APPLE__) #include "skia/ext/platform_device_mac.h" -#elif defined(__linux__) +#elif defined(__linux__) || defined(__FreeBSD__) #include "skia/ext/platform_device_linux.h" #endif diff --git a/skia/skia.gyp b/skia/skia.gyp index 67d1079..833235f 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -578,7 +578,7 @@ [ 'OS != "win"', { 'sources/': [ ['exclude', '_win\\.(cc|cpp)$'] ], }], - [ 'OS == "linux"', { + [ 'OS == "linux" or OS == "freebsd"', { 'dependencies': [ '../build/linux/system.gyp:gdk', '../build/linux/system.gyp:fontconfig', |