diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-07 18:31:40 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-07 18:31:40 +0000 |
| commit | 39be42426e89c7739555e45099c5326a3c525b8c (patch) | |
| tree | 6a81b59079a58ba7f9c79c8253194a1fdf3901b0 /base/shared_memory.h | |
| parent | a6b4a185656b7b16d965e5ff0e469658c424e85d (diff) | |
| download | chromium_src-39be42426e89c7739555e45099c5326a3c525b8c.zip chromium_src-39be42426e89c7739555e45099c5326a3c525b8c.tar.gz chromium_src-39be42426e89c7739555e45099c5326a3c525b8c.tar.bz2 | |
Add defines for the size of wchar_t to build_config.h. Use this in places where we currently have an OS-specific check.
Remove all WIN32 ifdefs from base and replace them with proper defined(OS...).
I also fixed random style bits when I encountered them. I made major style fixes to string16.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@524 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/shared_memory.h')
| -rw-r--r-- | base/shared_memory.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/base/shared_memory.h b/base/shared_memory.h index 00b51f9..3fb7298 100644 --- a/base/shared_memory.h +++ b/base/shared_memory.h @@ -27,17 +27,18 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef BASE_SHARED_MEMORY_H__ -#define BASE_SHARED_MEMORY_H__ +#ifndef BASE_SHARED_MEMORY_H_ +#define BASE_SHARED_MEMORY_H_ +#include "base/basictypes.h" #include "base/process_util.h" // SharedMemoryHandle is a platform specific type which represents // the underlying OS handle to a shared memory segment. -#ifdef WIN32 +#if defined(OS_WIN) typedef HANDLE SharedMemoryHandle; typedef HANDLE SharedMemoryLock; -#else +#elif defined(OS_POSIX) typedef int SharedMemoryHandle; typedef int SharedMemoryLock; #endif @@ -166,4 +167,4 @@ class SharedMemoryAutoLock { }; -#endif // BASE_SHARED_MEMORY_H__ +#endif // BASE_SHARED_MEMORY_H_ |