Index: tools/json_schema_compiler/cpp_bundle_generator.py |
diff --git a/tools/json_schema_compiler/cpp_bundle_generator.py b/tools/json_schema_compiler/cpp_bundle_generator.py |
index d47f57f16cf8d0f343c4a01a8debb98f8067eb64..1cadff8348da5e05f3d41b024ea87bfbe6572d12 100644 |
--- a/tools/json_schema_compiler/cpp_bundle_generator.py |
+++ b/tools/json_schema_compiler/cpp_bundle_generator.py |
@@ -84,9 +84,15 @@ class CppBundleGenerator(object): |
for platform in model_object.platforms: |
if platform == Platforms.CHROMEOS: |
ifdefs.append('defined(OS_CHROMEOS)') |
+ elif platform == Platforms.LINUX: |
+ ifdefs.append('defined(OS_LINUX)') |
+ elif platform == Platforms.MAC: |
+ ifdefs.append('defined(OS_MACOSX)') |
+ elif platform == Platforms.WIN: |
+ ifdefs.append('defined(OS_WIN)') |
else: |
raise ValueError("Unsupported platform ifdef: %s" % platform.name) |
- return ' and '.join(ifdefs) |
+ return ' || '.join(ifdefs) |
def _GenerateRegisterFunctions(self, namespace_name, function): |
c = code.Code() |