Change ppapi C++ comment style into C.

This allows graphics 2d example to compile.

BUG=none
TEST=Compiling examples/2d/graphics_2d.c with NaCl works.

Review URL: http://codereview.chromium.org/5997003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69725 0039d316-1c4b-4281-b951-d872f2087c98

66 files changed, 421 insertions, 353 deletions

diff --git a/ppapi/c/dev/deprecated_bool.h b/ppapi/c/dev/deprecated_bool.h
index 327700f..6c66dff 100644
--- a/ppapi/c/dev/deprecated_bool.h
+++ b/ppapi/c/dev/deprecated_bool.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_DEPRECATED_BOOL_H_
 #define PPAPI_C_DEV_DEPRECATED_BOOL_H_
 
@@ -39,5 +39,5 @@ typedef char bool;
  * End addtogroup PP
  */
 
-#endif  // PPAPI_C_DEV_DEPRECATED_BOOL_H_
+#endif  /* PPAPI_C_DEV_DEPRECATED_BOOL_H_ */
 
diff --git a/ppapi/c/dev/pp_cursor_type_dev.h b/ppapi/c/dev/pp_cursor_type_dev.h
index a799468..454e55b 100644
--- a/ppapi/c/dev/pp_cursor_type_dev.h
+++ b/ppapi/c/dev/pp_cursor_type_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PP_CURSORTYPE_DEV_H_
 #define PPAPI_C_DEV_PP_CURSORTYPE_DEV_H_
 
@@ -53,4 +53,5 @@ enum PP_CursorType_Dev {
 };
 PP_COMPILE_ASSERT_ENUM_SIZE_IN_BYTES(PP_CursorType_Dev, 4);
 
-#endif  // PPAPI_C_DEV_PP_CURSORTYPE_DEV_H_
+#endif  /* PPAPI_C_DEV_PP_CURSORTYPE_DEV_H_ */
+
diff --git a/ppapi/c/dev/pp_file_info_dev.h b/ppapi/c/dev/pp_file_info_dev.h
index d381193..dd247fc 100644
--- a/ppapi/c/dev/pp_file_info_dev.h
+++ b/ppapi/c/dev/pp_file_info_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PP_FILE_INFO_DEV_H_
 #define PPAPI_C_DEV_PP_FILE_INFO_DEV_H_
 
@@ -12,7 +12,7 @@
 typedef enum {
   PP_FILETYPE_REGULAR,
   PP_FILETYPE_DIRECTORY,
-  PP_FILETYPE_OTHER  // A catch-all for unidentified types.
+  PP_FILETYPE_OTHER  /* A catch-all for unidentified types. */
 } PP_FileType_Dev;
 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_FileType_Dev, 4);
 
@@ -24,7 +24,7 @@ typedef enum {
 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_FileSystemType_Dev, 4);
 
 struct PP_FileInfo_Dev {
-  int64_t size;  // Measured in bytes
+  int64_t size;  /* Measured in bytes */
   PP_FileType_Dev type;
   PP_FileSystemType_Dev system_type;
   PP_Time creation_time;
@@ -33,4 +33,5 @@ struct PP_FileInfo_Dev {
 };
 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_FileInfo_Dev, 40);
 
-#endif  // PPAPI_C_DEV_PP_FILE_INFO_DEV_H_
+#endif  /* PPAPI_C_DEV_PP_FILE_INFO_DEV_H_ */
+
diff --git a/ppapi/c/dev/pp_video_dev.h b/ppapi/c/dev/pp_video_dev.h
index adef7be..85fe3a6 100644
--- a/ppapi/c/dev/pp_video_dev.h
+++ b/ppapi/c/dev/pp_video_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PP_VIDEO_DEV_H_
 #define PPAPI_C_DEV_PP_VIDEO_DEV_H_
 
@@ -333,4 +333,5 @@ struct PP_VideoDecoderConfig_Dev {
   PP_VideoDecodeEventHandler_Func_Dev event_handler;
 };
 
-#endif  // PPAPI_C_DEV_PP_VIDEO_DEV_H_
+#endif  /* PPAPI_C_DEV_PP_VIDEO_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppb_audio_config_dev.h b/ppapi/c/dev/ppb_audio_config_dev.h
index 07c7824..cf0df7b 100644
--- a/ppapi/c/dev/ppb_audio_config_dev.h
+++ b/ppapi/c/dev/ppb_audio_config_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPB_AUDIO_CONFIG_DEV_H_
 #define PPAPI_C_DEV_PPB_AUDIO_CONFIG_DEV_H_
 
@@ -93,4 +93,5 @@ struct PPB_AudioConfig_Dev {
   uint32_t (*GetSampleFrameCount)(PP_Resource config);
 };
 
-#endif  // PPAPI_C_DEV_PPB_AUDIO_CONFIG_DEV_H_
+#endif  /* PPAPI_C_DEV_PPB_AUDIO_CONFIG_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppb_audio_dev.h b/ppapi/c/dev/ppb_audio_dev.h
index 667371c..1e78be2 100644
--- a/ppapi/c/dev/ppb_audio_dev.h
+++ b/ppapi/c/dev/ppb_audio_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPB_AUDIO_DEV_H_
 #define PPAPI_C_DEV_PPB_AUDIO_DEV_H_
 
@@ -69,4 +69,5 @@ struct PPB_Audio_Dev {
   PP_Bool (*StopPlayback)(PP_Resource audio);
 };
 
-#endif  // PPAPI_C_DEV_PPB_DEVICE_CONTEXT_AUDIO_DEV_H_
+#endif  /* PPAPI_C_DEV_PPB_DEVICE_CONTEXT_AUDIO_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppb_audio_trusted_dev.h b/ppapi/c/dev/ppb_audio_trusted_dev.h
index aab83fe..37249af 100644
--- a/ppapi/c/dev/ppb_audio_trusted_dev.h
+++ b/ppapi/c/dev/ppb_audio_trusted_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPB_AUDIO_TRUSTED_DEV_H_
 #define PPAPI_C_DEV_PPB_AUDIO_TRUSTED_DEV_H_
 
@@ -46,4 +46,5 @@ struct PPB_AudioTrusted_Dev {
                              uint32_t* shm_size);
 };
 
-#endif  // PPAPI_C_DEV_PPB_AUDIO_TRUSTED_DEV_H_
+#endif  /* PPAPI_C_DEV_PPB_AUDIO_TRUSTED_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppb_buffer_dev.h b/ppapi/c/dev/ppb_buffer_dev.h
index 9906967..8c39c420 100644
--- a/ppapi/c/dev/ppb_buffer_dev.h
+++ b/ppapi/c/dev/ppb_buffer_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPB_BUFFER_DEV_H_
 #define PPAPI_C_DEV_PPB_BUFFER_DEV_H_
 
@@ -33,4 +33,5 @@ struct PPB_Buffer_Dev {
   void (*Unmap)(PP_Resource resource);
 };
 
-#endif  // PPAPI_C_DEV_PPB_BUFFER_DEV_H_
+#endif  /* PPAPI_C_DEV_PPB_BUFFER_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppb_char_set_dev.h b/ppapi/c/dev/ppb_char_set_dev.h
index ac1ad96..19b0f25 100644
--- a/ppapi/c/dev/ppb_char_set_dev.h
+++ b/ppapi/c/dev/ppb_char_set_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPB_CHAR_SET_DEV_H_
 #define PPAPI_C_DEV_PPB_CHAR_SET_DEV_H_
 
@@ -77,4 +77,5 @@ struct PPB_CharSet_Dev {
   struct PP_Var (*GetDefaultCharSet)(PP_Module module);
 };
 
-#endif  // PPAPI_C_DEV_PPB_CHAR_SET_DEV_H_
+#endif  /* PPAPI_C_DEV_PPB_CHAR_SET_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppb_cursor_control_dev.h b/ppapi/c/dev/ppb_cursor_control_dev.h
index 45b37e2..92d63ac 100644
--- a/ppapi/c/dev/ppb_cursor_control_dev.h
+++ b/ppapi/c/dev/ppb_cursor_control_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPB_CURSOR_CONTROL_DEV_H_
 #define PPAPI_C_DEV_PPB_CURSOR_CONTROL_DEV_H_
 
@@ -53,4 +53,5 @@ struct PPB_CursorControl_Dev {
   PP_Bool (*CanLockCursor)(PP_Instance);
 };
 
-#endif  //  PPAPI_C_DEV_PPB_CURSOR_CONTROL_DEV_H_
+#endif  /* PPAPI_C_DEV_PPB_CURSOR_CONTROL_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppb_directory_reader_dev.h b/ppapi/c/dev/ppb_directory_reader_dev.h
index 8dc0f6a..a5f7b45 100644
--- a/ppapi/c/dev/ppb_directory_reader_dev.h
+++ b/ppapi/c/dev/ppb_directory_reader_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPB_DIRECTORY_READER_DEV_H_
 #define PPAPI_C_DEV_PPB_DIRECTORY_READER_DEV_H_
 
@@ -61,4 +61,5 @@ struct PPB_DirectoryReader_Dev {
                           struct PP_CompletionCallback callback);
 };
 
-#endif  // PPAPI_C_DEV_PPB_DIRECTORY_READER_DEV_H_
+#endif  /* PPAPI_C_DEV_PPB_DIRECTORY_READER_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppb_file_chooser_dev.h b/ppapi/c/dev/ppb_file_chooser_dev.h
index b63a930..22d799f 100644
--- a/ppapi/c/dev/ppb_file_chooser_dev.h
+++ b/ppapi/c/dev/ppb_file_chooser_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPB_FILE_CHOOSER_DEV_H_
 #define PPAPI_C_DEV_PPB_FILE_CHOOSER_DEV_H_
 
@@ -64,4 +64,5 @@ struct PPB_FileChooser_Dev {
   PP_Resource (*GetNextChosenFile)(PP_Resource chooser);
 };
 
-#endif  // PPAPI_C_DEV_PPB_FILE_CHOOSER_DEV_H_
+#endif  /* PPAPI_C_DEV_PPB_FILE_CHOOSER_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppb_file_io_dev.h b/ppapi/c/dev/ppb_file_io_dev.h
index 1264599..521980c 100644
--- a/ppapi/c/dev/ppb_file_io_dev.h
+++ b/ppapi/c/dev/ppb_file_io_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPB_FILE_IO_DEV_H_
 #define PPAPI_C_DEV_PPB_FILE_IO_DEV_H_
 
@@ -115,4 +115,5 @@ struct PPB_FileIO_Dev {
   void (*Close)(PP_Resource file_io);
 };
 
-#endif  // PPAPI_C_DEV_PPB_FILE_IO_DEV_H_
+#endif  /* PPAPI_C_DEV_PPB_FILE_IO_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppb_file_io_trusted_dev.h b/ppapi/c/dev/ppb_file_io_trusted_dev.h
index f4915fa..4919374 100644
--- a/ppapi/c/dev/ppb_file_io_trusted_dev.h
+++ b/ppapi/c/dev/ppb_file_io_trusted_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPB_FILE_IO_TRUSTED_DEV_H_
 #define PPAPI_C_DEV_PPB_FILE_IO_TRUSTED_DEV_H_
 
@@ -42,4 +42,5 @@ struct PPB_FileIOTrusted_Dev {
   // undesirable.
 };
 
-#endif  // PPAPI_C_DEV_PPB_FILE_IO_TRUSTED_DEV_H_
+#endif  /* PPAPI_C_DEV_PPB_FILE_IO_TRUSTED_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppb_file_ref_dev.h b/ppapi/c/dev/ppb_file_ref_dev.h
index 210ddbd..96f5fac 100644
--- a/ppapi/c/dev/ppb_file_ref_dev.h
+++ b/ppapi/c/dev/ppb_file_ref_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPB_FILE_REF_DEV_H_
 #define PPAPI_C_DEV_PPB_FILE_REF_DEV_H_
 
@@ -80,4 +80,5 @@ struct PPB_FileRef_Dev {
                     struct PP_CompletionCallback callback);
 };
 
-#endif  // PPAPI_C_DEV_PPB_FILE_REF_DEV_H_
+#endif  /* PPAPI_C_DEV_PPB_FILE_REF_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppb_file_system_dev.h b/ppapi/c/dev/ppb_file_system_dev.h
index 9f93a1a..9a1f9b1 100644
--- a/ppapi/c/dev/ppb_file_system_dev.h
+++ b/ppapi/c/dev/ppb_file_system_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPB_FILE_SYSTEM_DEV_H_
 #define PPAPI_C_DEV_PPB_FILE_SYSTEM_DEV_H_
 
@@ -26,4 +26,5 @@ struct PPB_FileSystem_Dev {
                   struct PP_CompletionCallback callback);
 };
 
-#endif  // PPAPI_C_DEV_PPB_FILE_SYSTEM_DEV_H_
+#endif  /* PPAPI_C_DEV_PPB_FILE_SYSTEM_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppb_find_dev.h b/ppapi/c/dev/ppb_find_dev.h
index b74416e..957cdfc 100644
--- a/ppapi/c/dev/ppb_find_dev.h
+++ b/ppapi/c/dev/ppb_find_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPB_FIND_DEV_H_
 #define PPAPI_C_DEV_PPB_FIND_DEV_H_
 
@@ -26,4 +26,5 @@ struct PPB_Find_Dev {
 
 };
 
-#endif  // PPAPI_C_DEV_PPB_FIND_DEV_H_
+#endif  /* PPAPI_C_DEV_PPB_FIND_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppb_font_dev.h b/ppapi/c/dev/ppb_font_dev.h
index 8056d95..8f6e5574 100644
--- a/ppapi/c/dev/ppb_font_dev.h
+++ b/ppapi/c/dev/ppb_font_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPB_FONT_DEV_H_
 #define PPAPI_C_DEV_PPB_FONT_DEV_H_
 
@@ -173,4 +173,5 @@ struct PPB_Font_Dev {
                                      uint32_t char_offset);
 };
 
-#endif  // PPAPI_C_DEV_PPB_FONT_DEV_H_
+#endif  /* PPAPI_C_DEV_PPB_FONT_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppb_fullscreen_dev.h b/ppapi/c/dev/ppb_fullscreen_dev.h
index 3166eb9..b6117551 100644
--- a/ppapi/c/dev/ppb_fullscreen_dev.h
+++ b/ppapi/c/dev/ppb_fullscreen_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPB_FULLSCREEN_DEV_H_
 #define PPAPI_C_DEV_PPB_FULLSCREEN_DEV_H_
 
@@ -25,4 +25,5 @@ struct PPB_Fullscreen_Dev {
   PP_Bool (*SetFullscreen)(PP_Instance instance, PP_Bool fullscreen);
 };
 
-#endif  // PPAPI_C_DEV_PPB_FULLSCREEN_DEV_H_
+#endif  /* PPAPI_C_DEV_PPB_FULLSCREEN_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppb_graphics_3d_dev.h b/ppapi/c/dev/ppb_graphics_3d_dev.h
index 27793c1..dc77571 100644
--- a/ppapi/c/dev/ppb_graphics_3d_dev.h
+++ b/ppapi/c/dev/ppb_graphics_3d_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPB_GRAPHICS_3D_DEV_H_
 #define PPAPI_C_DEV_PPB_GRAPHICS_3D_DEV_H_
 
@@ -101,4 +101,5 @@ struct PPB_Graphics3D_Dev {
   uint32_t (*GetError)();
 };
 
-#endif  // PPAPI_C_DEV_PPB_GRAPHICS_3D_DEV_H_
+#endif  /* PPAPI_C_DEV_PPB_GRAPHICS_3D_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppb_scrollbar_dev.h b/ppapi/c/dev/ppb_scrollbar_dev.h
index 25cf0e7..254402e 100644
--- a/ppapi/c/dev/ppb_scrollbar_dev.h
+++ b/ppapi/c/dev/ppb_scrollbar_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPB_SCROLLBAR_DEV_H_
 #define PPAPI_C_DEV_PPB_SCROLLBAR_DEV_H_
 
@@ -62,4 +62,5 @@ struct PPB_Scrollbar_Dev {
                    int32_t multiplier);
 };
 
-#endif  // PPAPI_C_DEV_PPB_SCROLLBAR_DEV_H_
+#endif  /* PPAPI_C_DEV_PPB_SCROLLBAR_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppb_testing_dev.h b/ppapi/c/dev/ppb_testing_dev.h
index 5606ca6..7b26c72 100644
--- a/ppapi/c/dev/ppb_testing_dev.h
+++ b/ppapi/c/dev/ppb_testing_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPB_TESTING_DEV_H_
 #define PPAPI_C_DEV_PPB_TESTING_DEV_H_
 
@@ -68,4 +68,5 @@ struct PPB_Testing_Dev {
   uint32_t (*GetLiveObjectCount)(PP_Module module);
 };
 
-#endif  // PPAPI_C_DEV_PPB_TESTING_DEV_H_
+#endif  /* PPAPI_C_DEV_PPB_TESTING_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppb_transport_dev.h b/ppapi/c/dev/ppb_transport_dev.h
index 33dbf57..6196dad 100644
--- a/ppapi/c/dev/ppb_transport_dev.h
+++ b/ppapi/c/dev/ppb_transport_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PPB_TRANSPORT_DEV_H_
 #define PPAPI_C_PPB_TRANSPORT_DEV_H_
 
@@ -67,4 +67,5 @@ struct PPB_Transport_Dev {
   int32_t (*Close)(PP_Resource transport);
 };
 
-#endif  // PPAPI_C_PPB_TRANSPORT_DEV_H_
+#endif  /* PPAPI_C_PPB_TRANSPORT_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppb_url_util_dev.h b/ppapi/c/dev/ppb_url_util_dev.h
index 49bcc18..cf8f287 100644
--- a/ppapi/c/dev/ppb_url_util_dev.h
+++ b/ppapi/c/dev/ppb_url_util_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPB_URL_UTIL_DEV_H_
 #define PPAPI_C_DEV_PPB_URL_UTIL_DEV_H_
 
@@ -111,4 +111,5 @@ struct PPB_UrlUtil_Dev {
   PP_Bool (*DocumentCanAccessDocument)(PP_Instance active, PP_Instance target);
 };
 
-#endif  // PPAPI_C_DEV_PPB_URL_UTIL_DEV_H_
+#endif  /* PPAPI_C_DEV_PPB_URL_UTIL_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppb_var_deprecated.h b/ppapi/c/dev/ppb_var_deprecated.h
index e71ba9f..dd3f8bc 100644
--- a/ppapi/c/dev/ppb_var_deprecated.h
+++ b/ppapi/c/dev/ppb_var_deprecated.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PPB_VAR_DEPRECATED_H_
 #define PPAPI_C_PPB_VAR_DEPRECATED_H_
 
@@ -240,4 +240,5 @@ struct PPB_Var_Deprecated {
  * @}
  * End addtogroup PPB
  */
-#endif  // PPAPI_C_PPB_VAR_DEPRECATED_H_
+#endif  /* PPAPI_C_PPB_VAR_DEPRECATED_H_ */
+
diff --git a/ppapi/c/dev/ppb_video_decoder_dev.h b/ppapi/c/dev/ppb_video_decoder_dev.h
index 975e68b..f4e6a31 100644
--- a/ppapi/c/dev/ppb_video_decoder_dev.h
+++ b/ppapi/c/dev/ppb_video_decoder_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPB_VIDEO_DECODER_DEV_H_
 #define PPAPI_C_DEV_PPB_VIDEO_DECODER_DEV_H_
 
@@ -84,4 +84,5 @@ struct PPB_VideoDecoder_Dev {
       struct PP_VideoUncompressedDataBuffer_Dev* buffer);
 };
 
-#endif  // PPAPI_C_DEV_PPB_VIDEO_DECODER_DEV_H_
+#endif  /* PPAPI_C_DEV_PPB_VIDEO_DECODER_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppb_widget_dev.h b/ppapi/c/dev/ppb_widget_dev.h
index 3d23e0e..1c2edfdb 100644
--- a/ppapi/c/dev/ppb_widget_dev.h
+++ b/ppapi/c/dev/ppb_widget_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPB_WIDGET_DEV_H_
 #define PPAPI_C_DEV_PPB_WIDGET_DEV_H_
 
@@ -38,4 +38,5 @@ struct PPB_Widget_Dev {
                       const struct PP_Rect* location);
 };
 
-#endif  // PPAPI_C_DEV_PPB_WIDGET_DEV_H_
+#endif  /* PPAPI_C_DEV_PPB_WIDGET_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppb_zoom_dev.h b/ppapi/c/dev/ppb_zoom_dev.h
index e6046e1..83c6f6b 100644
--- a/ppapi/c/dev/ppb_zoom_dev.h
+++ b/ppapi/c/dev/ppb_zoom_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPB_ZOOM_DEV_H_
 #define PPAPI_C_DEV_PPB_ZOOM_DEV_H_
 
@@ -25,4 +25,5 @@ struct PPB_Zoom_Dev {
                             double maximium_factor);
 };
 
-#endif  // PPAPI_C_DEV_PPB_ZOOM_DEV_H_
+#endif  /* PPAPI_C_DEV_PPB_ZOOM_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppp_class_deprecated.h b/ppapi/c/dev/ppp_class_deprecated.h
index 2f82348..0f39d26 100644
--- a/ppapi/c/dev/ppp_class_deprecated.h
+++ b/ppapi/c/dev/ppp_class_deprecated.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PPP_CLASS_DEPRECATED_H_
 #define PPAPI_C_PPP_CLASS_DEPRECATED_H_
 
@@ -131,4 +131,5 @@ struct PPP_Class_Deprecated {
  * @}
  * End addtogroup PPP
  */
-#endif  // PPAPI_C_PPP_CLASS_DEPRECATED_H_
+#endif  /* PPAPI_C_PPP_CLASS_DEPRECATED_H_ */
+
diff --git a/ppapi/c/dev/ppp_cursor_control_dev.h b/ppapi/c/dev/ppp_cursor_control_dev.h
index b9403f4..8a28bf6 100644
--- a/ppapi/c/dev/ppp_cursor_control_dev.h
+++ b/ppapi/c/dev/ppp_cursor_control_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPP_CURSOR_CONTROL_DEV_H_
 #define PPAPI_C_DEV_PPP_CURSOR_CONTROL_DEV_H_
 
@@ -15,5 +15,5 @@ struct PPP_CursorControl_Dev {
   void (*CursorLockLost)(PP_Instance instance);
 };
 
-#endif  // PPAPI_C_DEV_PPP_CURSOR_CONTROL_DEV_H_
+#endif  /* PPAPI_C_DEV_PPP_CURSOR_CONTROL_DEV_H_ */
 
diff --git a/ppapi/c/dev/ppp_find_dev.h b/ppapi/c/dev/ppp_find_dev.h
index c20f699..c97a2b4 100644
--- a/ppapi/c/dev/ppp_find_dev.h
+++ b/ppapi/c/dev/ppp_find_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPP_FIND_DEV_H_
 #define PPAPI_C_DEV_PPP_FIND_DEV_H_
 
@@ -31,4 +31,5 @@ struct PPP_Find_Dev {
   void (*StopFind)(PP_Instance instance);
 };
 
-#endif  // PPAPI_C_DEV_PPP_FIND_DEV_H_
+#endif  /* PPAPI_C_DEV_PPP_FIND_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppp_graphics_3d_dev.h b/ppapi/c/dev/ppp_graphics_3d_dev.h
index 2dc4402..d0a4e16 100644
--- a/ppapi/c/dev/ppp_graphics_3d_dev.h
+++ b/ppapi/c/dev/ppp_graphics_3d_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPP_GRAPHICS_3D_DEV_H_
 #define PPAPI_C_DEV_PPP_GRAPHICS_3D_DEV_H_
 
@@ -14,5 +14,5 @@ struct PPP_Graphics3D_Dev {
   void (*Graphics3DContextLost)(PP_Instance instance);
 };
 
-#endif  // PPAPI_C_DEV_PPP_GRAPHICS_3D_DEV_H_
+#endif  /* PPAPI_C_DEV_PPP_GRAPHICS_3D_DEV_H_ */
 
diff --git a/ppapi/c/dev/ppp_printing_dev.h b/ppapi/c/dev/ppp_printing_dev.h
index 00b5e6b..800268d 100644
--- a/ppapi/c/dev/ppp_printing_dev.h
+++ b/ppapi/c/dev/ppp_printing_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPP_PRINTING_DEV_H_
 #define PPAPI_C_DEV_PPP_PRINTING_DEV_H_
 
@@ -76,4 +76,5 @@ struct PPP_Printing_Dev {
   void (*End)(PP_Instance instance);
 };
 
-#endif  // PPAPI_C_DEV_PPP_PRINTING_DEV_H_
+#endif  /* PPAPI_C_DEV_PPP_PRINTING_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppp_scrollbar_dev.h b/ppapi/c/dev/ppp_scrollbar_dev.h
index b032a2a..4b464d5 100644
--- a/ppapi/c/dev/ppp_scrollbar_dev.h
+++ b/ppapi/c/dev/ppp_scrollbar_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPP_SCROLLBAR_DEV_H_
 #define PPAPI_C_DEV_PPP_SCROLLBAR_DEV_H_
 
@@ -19,4 +19,5 @@ struct PPP_Scrollbar_Dev {
                        uint32_t value);
 };
 
-#endif  // PPAPI_C_DEV_PPP_SCROLLBAR_DEV_H_
+#endif  /* PPAPI_C_DEV_PPP_SCROLLBAR_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppp_selection_dev.h b/ppapi/c/dev/ppp_selection_dev.h
index 834b4ed..71ca4db 100644
--- a/ppapi/c/dev/ppp_selection_dev.h
+++ b/ppapi/c/dev/ppp_selection_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPP_SELECTION_DEV_H_
 #define PPAPI_C_DEV_PPP_SELECTION_DEV_H_
 
@@ -21,4 +21,5 @@ struct PPP_Selection_Dev {
                                    PP_Bool html);
 };
 
-#endif  // PPAPI_C_DEV_PPP_SELECTION_DEV_H_
+#endif  /* PPAPI_C_DEV_PPP_SELECTION_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppp_widget_dev.h b/ppapi/c/dev/ppp_widget_dev.h
index 26a4847..8d392da 100644
--- a/ppapi/c/dev/ppp_widget_dev.h
+++ b/ppapi/c/dev/ppp_widget_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPP_WIDGET_DEV_H_
 #define PPAPI_C_DEV_PPP_WIDGET_DEV_H_
 
@@ -19,4 +19,5 @@ struct PPP_Widget_Dev {
                      const struct PP_Rect* dirty_rect);
 };
 
-#endif  // PPAPI_C_DEV_PPP_WIDGET_DEV_H_
+#endif  /* PPAPI_C_DEV_PPP_WIDGET_DEV_H_ */
+
diff --git a/ppapi/c/dev/ppp_zoom_dev.h b/ppapi/c/dev/ppp_zoom_dev.h
index 90c8be9..71f0402 100644
--- a/ppapi/c/dev/ppp_zoom_dev.h
+++ b/ppapi/c/dev/ppp_zoom_dev.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_DEV_PPP_ZOOM_DEV_H_
 #define PPAPI_C_DEV_PPP_ZOOM_DEV_H_
 
@@ -20,4 +20,5 @@ struct PPP_Zoom_Dev {
                PP_Bool text_only);
 };
 
-#endif  // PPAPI_C_DEV_PPP_ZOOM_DEV_H_
+#endif  /* PPAPI_C_DEV_PPP_ZOOM_DEV_H_ */
+
diff --git a/ppapi/c/pp_bool.h b/ppapi/c/pp_bool.h
index 929c51c..8bca4ef 100644
--- a/ppapi/c/pp_bool.h
+++ b/ppapi/c/pp_bool.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PP_BOOL_H_
 #define PPAPI_C_PP_BOOL_H_
 
@@ -32,5 +32,5 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_Bool, 4);
  * End addtogroup PP
  */
 
-#endif  // PPAPI_C_PP_BOOL_H_
+#endif  /* PPAPI_C_PP_BOOL_H_ */
 
diff --git a/ppapi/c/pp_completion_callback.h b/ppapi/c/pp_completion_callback.h
index 8e148bc..ac9aa3f 100644
--- a/ppapi/c/pp_completion_callback.h
+++ b/ppapi/c/pp_completion_callback.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PP_COMPLETION_CALLBACK_H_
 #define PPAPI_C_PP_COMPLETION_CALLBACK_H_
 
@@ -40,7 +40,9 @@ struct PP_CompletionCallback {
 PP_INLINE struct PP_CompletionCallback PP_MakeCompletionCallback(
     PP_CompletionCallback_Func func,
     void* user_data) {
-  struct PP_CompletionCallback cc = { func, user_data };
+  struct PP_CompletionCallback cc;
+  cc.func = func;
+  cc.user_data = user_data;
   return cc;
 }
 
@@ -62,4 +64,5 @@ PP_INLINE struct PP_CompletionCallback PP_BlockUntilComplete() {
  * @}
  * End of addtogroup PP
  */
-#endif  // PPAPI_C_PP_COMPLETION_CALLBACK_H_
+#endif  /* PPAPI_C_PP_COMPLETION_CALLBACK_H_ */
+
diff --git a/ppapi/c/pp_errors.h b/ppapi/c/pp_errors.h
index a5ab5d1..5d2e13a 100644
--- a/ppapi/c/pp_errors.h
+++ b/ppapi/c/pp_errors.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PP_ERRORS_H_
 #define PPAPI_C_PP_ERRORS_H_
 
@@ -79,4 +79,5 @@ enum {
  * End of addtogroup PP
  */
 
-#endif  // PPAPI_C_PP_ERRORS_H_
+#endif  /* PPAPI_C_PP_ERRORS_H_ */
+
diff --git a/ppapi/c/pp_input_event.h b/ppapi/c/pp_input_event.h
index 5ac9e5e..0aae4ea 100644
--- a/ppapi/c/pp_input_event.h
+++ b/ppapi/c/pp_input_event.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PP_INPUT_EVENT_H_
 #define PPAPI_C_PP_INPUT_EVENT_H_
 
@@ -193,4 +193,5 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_InputEvent, 80);
  * End of addtogroup PP
  */
 
-#endif  // PPAPI_C_PP_INPUT_EVENT_H_
+#endif  /* PPAPI_C_PP_INPUT_EVENT_H_ */
+
diff --git a/ppapi/c/pp_instance.h b/ppapi/c/pp_instance.h
index f061ceb..7195b54 100644
--- a/ppapi/c/pp_instance.h
+++ b/ppapi/c/pp_instance.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PP_INSTANCE_H_
 #define PPAPI_C_PP_INSTANCE_H_
 
@@ -32,4 +32,5 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_Instance, 8);
  * End addtogroup PP
  */
 
-#endif  // PPAPI_C_PP_INSTANCE_H_
+#endif  /* PPAPI_C_PP_INSTANCE_H_ */
+
diff --git a/ppapi/c/pp_macros.h b/ppapi/c/pp_macros.h
index c56bc85..0cda905 100644
--- a/ppapi/c/pp_macros.h
+++ b/ppapi/c/pp_macros.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PP_MACROS_H_
 #define PPAPI_C_PP_MACROS_H_
 
@@ -90,5 +90,5 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES_IMPL(NAME, enum NAME, SIZE)
  * End of addtogroup PP
  */
 
-#endif  // PPAPI_C_PP_MACROS_H_
+#endif  /* PPAPI_C_PP_MACROS_H_ */
 
diff --git a/ppapi/c/pp_module.h b/ppapi/c/pp_module.h
index f62337b..6c0ee0f 100644
--- a/ppapi/c/pp_module.h
+++ b/ppapi/c/pp_module.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PP_MODULE_H_
 #define PPAPI_C_PP_MODULE_H_
 
@@ -29,4 +29,5 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_Module, 8);
  * End addtogroup PP
  */
 
-#endif  // PPAPI_C_PP_MODULE_H_
+#endif  /* PPAPI_C_PP_MODULE_H_ */
+
diff --git a/ppapi/c/pp_point.h b/ppapi/c/pp_point.h
index 675a552..fe15dbe 100644
--- a/ppapi/c/pp_point.h
+++ b/ppapi/c/pp_point.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PP_POINT_H_
 #define PPAPI_C_PP_POINT_H_
 
@@ -34,4 +34,5 @@ PP_INLINE struct PP_Point PP_MakePoint(int32_t x, int32_t y) {
  * End addtogroup PP
  */
 
-#endif  // PPAPI_C_PP_POINT_H_
+#endif  /* PPAPI_C_PP_POINT_H_ */
+
diff --git a/ppapi/c/pp_rect.h b/ppapi/c/pp_rect.h
index 561a7cc..9fae6f8 100644
--- a/ppapi/c/pp_rect.h
+++ b/ppapi/c/pp_rect.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PP_RECT_H_
 #define PPAPI_C_PP_RECT_H_
 
@@ -38,4 +38,5 @@ PP_INLINE struct PP_Rect PP_MakeRectFromXYWH(int32_t x, int32_t y,
  * @}
  * End addtogroup PP
  */
-#endif  // PPAPI_C_PP_RECT_H_
+#endif  /* PPAPI_C_PP_RECT_H_ */
+
diff --git a/ppapi/c/pp_resource.h b/ppapi/c/pp_resource.h
index c3d1aca..b4af2cc 100644
--- a/ppapi/c/pp_resource.h
+++ b/ppapi/c/pp_resource.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PP_RESOURCE_H_
 #define PPAPI_C_PP_RESOURCE_H_
 
@@ -38,4 +38,5 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_Resource, 8);
  * End addtogroup PP
  */
 
-#endif  // PPAPI_C_PP_RESOURCE_H_
+#endif  /* PPAPI_C_PP_RESOURCE_H_ */
+
diff --git a/ppapi/c/pp_size.h b/ppapi/c/pp_size.h
index 722af51..945a499 100644
--- a/ppapi/c/pp_size.h
+++ b/ppapi/c/pp_size.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PP_SIZE_H_
 #define PPAPI_C_PP_SIZE_H_
 
@@ -33,4 +33,5 @@ PP_INLINE struct PP_Size PP_MakeSize(int32_t w, int32_t h) {
  * @}
  * End addtogroup PP
  */
-#endif  // PPAPI_C_PP_SIZE_H_
+#endif  /* PPAPI_C_PP_SIZE_H_ */
+
diff --git a/ppapi/c/pp_stdint.h b/ppapi/c/pp_stdint.h
index 23a7b78..2875e4b 100644
--- a/ppapi/c/pp_stdint.h
+++ b/ppapi/c/pp_stdint.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PP_STDINT_H_
 #define PPAPI_C_PP_STDINT_H_
 
@@ -28,10 +28,11 @@ typedef unsigned __int64 uint64_t;
 #include <stdint.h>
 #endif
 
-#include <stddef.h>  // Needed for size_t.
+#include <stddef.h>  /* Needed for size_t. */
 
 /**
  * @}
  * End addtogroup PP
  */
-#endif  // PPAPI_C_PP_STDINT_H_
+#endif  /* PPAPI_C_PP_STDINT_H_ */
+
diff --git a/ppapi/c/pp_time.h b/ppapi/c/pp_time.h
index 330a16c..1672531 100644
--- a/ppapi/c/pp_time.h
+++ b/ppapi/c/pp_time.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PP_TIME_H_
 #define PPAPI_C_PP_TIME_H_
 
@@ -39,4 +39,5 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_TimeTicks, 8);
  * @}
  * End addtogroup PP
  */
-#endif  // PPAPI_C_PP_TIME_H_
+#endif  /* PPAPI_C_PP_TIME_H_ */
+
diff --git a/ppapi/c/pp_var.h b/ppapi/c/pp_var.h
index 1695293..9a429cb 100644
--- a/ppapi/c/pp_var.h
+++ b/ppapi/c/pp_var.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PP_VAR_H_
 #define PPAPI_C_PP_VAR_H_
 
@@ -96,4 +96,5 @@ PP_INLINE struct PP_Var PP_MakeDouble(double value) {
  * @}
  * End addtogroup PP
  */
-#endif  // PPAPI_C_PP_VAR_H_
+#endif  /* PPAPI_C_PP_VAR_H_ */
+
diff --git a/ppapi/c/ppb.h b/ppapi/c/ppb.h
index 1f525cd..3f05257 100644
--- a/ppapi/c/ppb.h
+++ b/ppapi/c/ppb.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PPB_H_
 #define PPAPI_C_PPB_H_
 
@@ -23,4 +23,5 @@ typedef const void* (*PPB_GetInterface)(const char* interface_name);
  * @}
  * End addtogroup PPB
  */
-#endif  // PPAPI_C_PPB_H_
+#endif  /* PPAPI_C_PPB_H_ */
+
diff --git a/ppapi/c/ppb_class.h b/ppapi/c/ppb_class.h
index 0cb249c..a5619ef 100644
--- a/ppapi/c/ppb_class.h
+++ b/ppapi/c/ppb_class.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PPB_CLASS_H_
 #define PPAPI_C_PPB_CLASS_H_
 
@@ -121,4 +121,5 @@ struct PPB_Class {
  * @}
  * End addtogroup PPP
  */
-#endif  // PPAPI_C_PPP_CLASS_H_
+#endif  /* PPAPI_C_PPP_CLASS_H_ */
+
diff --git a/ppapi/c/ppb_core.h b/ppapi/c/ppb_core.h
index 471322a..2b5c784 100644
--- a/ppapi/c/ppb_core.h
+++ b/ppapi/c/ppb_core.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PPB_CORE_H_
 #define PPAPI_C_PPB_CORE_H_
 
@@ -90,4 +90,5 @@ struct PPB_Core {
  * @}
  * End addtogroup PPB
  */
-#endif  // PPAPI_C_DEV_PPB_CORE_DEV_H_
+#endif  /* PPAPI_C_DEV_PPB_CORE_DEV_H_ */
+
diff --git a/ppapi/c/ppb_graphics_2d.h b/ppapi/c/ppb_graphics_2d.h
index 8f152d33..6daa16f 100644
--- a/ppapi/c/ppb_graphics_2d.h
+++ b/ppapi/c/ppb_graphics_2d.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PPB_GRAPHICS_2D_H_
 #define PPAPI_C_PPB_GRAPHICS_2D_H_
 
@@ -210,8 +210,9 @@ struct PPB_Graphics2D {
    * Flush is already pending that has not issued its callback yet.  In the
    * failure case, nothing will be updated and no callback will be scheduled.
    */
-  // TODO(darin): We should ensure that the completion callback always runs, so
-  // that it is easier for consumers to manage memory referenced by a callback.
+  /* TODO(darin): We should ensure that the completion callback always runs, so
+   * that it is easier for consumers to manage memory referenced by a callback.
+   */
   int32_t (*Flush)(PP_Resource graphics_2d,
                    struct PP_CompletionCallback callback);
 
@@ -221,4 +222,5 @@ struct PPB_Graphics2D {
  * @}
  * End addtogroup PPB
  */
-#endif  // PPAPI_C_PPB_GRAPHICS_2D_H_
+#endif  /* PPAPI_C_PPB_GRAPHICS_2D_H_ */
+
diff --git a/ppapi/c/ppb_image_data.h b/ppapi/c/ppb_image_data.h
index ce9356f..e1fe5d0 100644
--- a/ppapi/c/ppb_image_data.h
+++ b/ppapi/c/ppb_image_data.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PPB_IMAGE_DATA_H_
 #define PPAPI_C_PPB_IMAGE_DATA_H_
 
@@ -21,11 +21,12 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_ImageDataFormat, 4);
 struct PP_ImageDataDesc {
   PP_ImageDataFormat format;
 
-  // Size of the bitmap in pixels.
+  /** Size of the bitmap in pixels. */
   struct PP_Size size;
 
-  // The row width in bytes. This may be different than width * 4 since there
-  // may be padding at the end of the lines.
+  /** The row width in bytes. This may be different than width * 4 since there
+   * may be padding at the end of the lines.
+   */
   int32_t stride;
 };
 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_ImageDataDesc, 16);
@@ -100,4 +101,5 @@ struct PPB_ImageData {
  * @}
  * End addtogroup PPB
  */
-#endif  // PPAPI_C_PPB_IMAGE_DATA_H_
+#endif  /* PPAPI_C_PPB_IMAGE_DATA_H_ */
+
diff --git a/ppapi/c/ppb_instance.h b/ppapi/c/ppb_instance.h
index f7f137f..5113e85 100644
--- a/ppapi/c/ppb_instance.h
+++ b/ppapi/c/ppb_instance.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PPB_INSTANCE_H_
 #define PPAPI_C_PPB_INSTANCE_H_
 
@@ -88,4 +88,5 @@ struct PPB_Instance {
  * @}
  * End addtogroup PPB
  */
-#endif  // PPAPI_C_PPB_INSTANCE_H_
+#endif  /* PPAPI_C_PPB_INSTANCE_H_ */
+
diff --git a/ppapi/c/ppb_url_loader.h b/ppapi/c/ppb_url_loader.h
index 7d039d6..1d0c063 100644
--- a/ppapi/c/ppb_url_loader.h
+++ b/ppapi/c/ppb_url_loader.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PPB_URL_LOADER_H_
 #define PPAPI_C_PPB_URL_LOADER_H_
 
@@ -106,4 +106,5 @@ struct PPB_URLLoader {
   void (*Close)(PP_Resource loader);
 };
 
-#endif  // PPAPI_C_PPB_URL_LOADER_H_
+#endif  /* PPAPI_C_PPB_URL_LOADER_H_ */
+
diff --git a/ppapi/c/ppb_url_request_info.h b/ppapi/c/ppb_url_request_info.h
index 5a8c1f2..f18ee52 100644
--- a/ppapi/c/ppb_url_request_info.h
+++ b/ppapi/c/ppb_url_request_info.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PPB_URL_REQUEST_INFO_H_
 #define PPAPI_C_PPB_URL_REQUEST_INFO_H_
 
@@ -84,4 +84,5 @@ struct PPB_URLRequestInfo {
                               PP_Time expected_last_modified_time);
 };
 
-#endif  // PPAPI_C_PPB_URL_REQUEST_INFO_H_
+#endif  /* PPAPI_C_PPB_URL_REQUEST_INFO_H_ */
+
diff --git a/ppapi/c/ppb_url_response_info.h b/ppapi/c/ppb_url_response_info.h
index e9cec29..756e2f8 100644
--- a/ppapi/c/ppb_url_response_info.h
+++ b/ppapi/c/ppb_url_response_info.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PPB_URL_RESPONSE_INFO_H_
 #define PPAPI_C_PPB_URL_RESPONSE_INFO_H_
 
@@ -42,4 +42,5 @@ struct PPB_URLResponseInfo {
   PP_Resource (*GetBodyAsFileRef)(PP_Resource response);
 };
 
-#endif  // PPAPI_C_PPB_URL_RESPONSE_INFO_H_
+#endif  /* PPAPI_C_PPB_URL_RESPONSE_INFO_H_ */
+
diff --git a/ppapi/c/ppb_var.h b/ppapi/c/ppb_var.h
index a4a1f25..34ff04f 100644
--- a/ppapi/c/ppb_var.h
+++ b/ppapi/c/ppb_var.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PPB_VAR_H_
 #define PPAPI_C_PPB_VAR_H_
 
@@ -306,4 +306,5 @@ PP_INLINE struct PP_ObjectProperty PP_MakeSimpleProperty(struct PP_Var name,
  * @}
  * End addtogroup PPB
  */
-#endif  // PPAPI_C_PPB_VAR_H_
+#endif  /* PPAPI_C_PPB_VAR_H_ */
+
diff --git a/ppapi/c/ppp.h b/ppapi/c/ppp.h
index 67d66c3..2f3a19a 100644
--- a/ppapi/c/ppp.h
+++ b/ppapi/c/ppp.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PPP_H_
 #define PPAPI_C_PPP_H_
 
@@ -24,8 +24,9 @@
  * @{
  */
 
-// We don't want name mangling for these external functions.  We only need
-// 'extern "C"' if we're compiling with a C++ compiler.
+/* We don't want name mangling for these external functions.  We only need
+ * 'extern "C"' if we're compiling with a C++ compiler.
+ */
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -50,11 +51,12 @@ PP_EXPORT void PPP_ShutdownModule();
 PP_EXPORT const void* PPP_GetInterface(const char* interface_name);
 
 #ifdef __cplusplus
-}  // extern "C"
+}  /* extern "C" */
 #endif
 
 /**
  * @}
  * End addtogroup PPP
  */
-#endif  // PPAPI_C_PPP_H_
+#endif  /* PPAPI_C_PPP_H_ */
+
diff --git a/ppapi/c/ppp_instance.h b/ppapi/c/ppp_instance.h
index 46d49a2..f32fbde 100644
--- a/ppapi/c/ppp_instance.h
+++ b/ppapi/c/ppp_instance.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PPP_INSTANCE_H_
 #define PPAPI_C_PPP_INSTANCE_H_
 
@@ -131,4 +131,5 @@ struct PPP_Instance {
  * @}
  * End addtogroup PPP
  */
-#endif  // PPAPI_C_PPP_INSTANCE_H_
+#endif  /* PPAPI_C_PPP_INSTANCE_H_ */
+
diff --git a/ppapi/c/trusted/ppb_image_data_trusted.h b/ppapi/c/trusted/ppb_image_data_trusted.h
index bbc944d..c5e63239 100644
--- a/ppapi/c/trusted/ppb_image_data_trusted.h
+++ b/ppapi/c/trusted/ppb_image_data_trusted.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_TRUSTED_PPB_IMAGE_DATA_TRUSTED_H_
 #define PPAPI_C_TRUSTED_PPB_IMAGE_DATA_TRUSTED_H_
 
@@ -24,3 +24,4 @@ struct PPB_ImageDataTrusted {
 };
 
 #endif  // PPAPI_C_TRUSTED_PPB_IMAGE_DATA_TRUSTED_H_
+
diff --git a/ppapi/c/trusted/ppb_url_loader_trusted.h b/ppapi/c/trusted/ppb_url_loader_trusted.h
index 4e027f9..53b2b2d 100644
--- a/ppapi/c/trusted/ppb_url_loader_trusted.h
+++ b/ppapi/c/trusted/ppb_url_loader_trusted.h
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #ifndef PPAPI_C_PPB_URL_LOADER_TRUSTED_H_
 #define PPAPI_C_PPB_URL_LOADER_TRUSTED_H_
 
@@ -43,3 +43,4 @@ struct PPB_URLLoaderTrusted {
 };
 
 #endif  // PPAPI_C_PPB_URL_LOADER_H_
+
diff --git a/ppapi/examples/2d/graphics_2d_example.c b/ppapi/examples/2d/graphics_2d_example.c
index 01dd4fb..4e2fcd7 100644
--- a/ppapi/examples/2d/graphics_2d_example.c
+++ b/ppapi/examples/2d/graphics_2d_example.c
@@ -1,7 +1,7 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
+/* Copyright (c) 2010 The Chromium Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 #include <stdlib.h>
 #include <string.h>
 
@@ -27,7 +27,7 @@ const struct PPB_Graphics2D* g_graphics_2d_interface;
 const struct PPB_ImageData* g_image_data_interface;
 const struct PPB_Instance* g_instance_interface;
 
-// PPP_Instance implementation -------------------------------------------------
+/* PPP_Instance implementation -----------------------------------------------*/
 
 struct InstanceInfo {
   PP_Instance pp_instance;
@@ -36,10 +36,10 @@ struct InstanceInfo {
   struct InstanceInfo* next;
 };
 
-// Linked list of all live instances.
+/** Linked list of all live instances. */
 struct InstanceInfo* all_instances = NULL;
 
-// Returns a refed resource corresponding to the created device context.
+/** Returns a refed resource corresponding to the created device context. */
 PP_Resource MakeAndBindDeviceContext(PP_Instance instance,
                                      const struct PP_Size* size) {
   PP_Resource device_context;
@@ -56,7 +56,7 @@ PP_Resource MakeAndBindDeviceContext(PP_Instance instance,
 }
 
 void FlushCompletionCallback(void* user_data, int32_t result) {
-  // Don't need to do anything here.
+  /* Don't need to do anything here. */
 }
 
 void Repaint(struct InstanceInfo* instance, const struct PP_Size* size) {
@@ -65,14 +65,14 @@ void Repaint(struct InstanceInfo* instance, const struct PP_Size* size) {
   uint32_t* image_data;
   int num_words, i;
 
-  // Create image data to paint into.
+  /* Create image data to paint into. */
   image = g_image_data_interface->Create(
       g_module_id, PP_IMAGEDATAFORMAT_BGRA_PREMUL, size, PP_TRUE);
   if (!image)
     return;
   g_image_data_interface->Describe(image, &image_desc);
 
-  // Fill the image with blue.
+  /* Fill the image with blue. */
   image_data = (uint32_t*)g_image_data_interface->Map(image);
   if (!image_data) {
     g_core_interface->ReleaseResource(image);
@@ -82,7 +82,7 @@ void Repaint(struct InstanceInfo* instance, const struct PP_Size* size) {
   for (i = 0; i < num_words; i++)
     image_data[i] = 0xFF0000FF;
 
-  // Create the device context and paint the image to it.
+  /* Create the device context and paint the image to it. */
   device_context = MakeAndBindDeviceContext(instance->pp_instance, size);
   if (!device_context) {
     g_core_interface->ReleaseResource(image);
@@ -97,7 +97,7 @@ void Repaint(struct InstanceInfo* instance, const struct PP_Size* size) {
   g_core_interface->ReleaseResource(image);
 }
 
-// Returns the info for the given instance, or NULL if it's not found.
+/** Returns the info for the given instance, or NULL if it's not found. */
 struct InstanceInfo* FindInstance(PP_Instance instance) {
   struct InstanceInfo* cur = all_instances;
   while (cur) {
@@ -117,14 +117,16 @@ PP_Bool Instance_DidCreate(PP_Instance instance,
   info->last_size.width = 0;
   info->last_size.height = 0;
 
-  // Insert into linked list of live instances.
+  /* Insert into linked list of live instances. */
   info->next = all_instances;
   all_instances = info;
   return PP_TRUE;
 }
 
 void Instance_DidDestroy(PP_Instance instance) {
-  // Find the matching item in the linked list, delete it, and patch the links.
+  /* Find the matching item in the linked list, delete it, and patch the
+   * links.
+   */
   struct InstanceInfo** prev_ptr = &all_instances;
   struct InstanceInfo* cur = all_instances;
   while (cur) {
@@ -146,7 +148,7 @@ void Instance_DidChangeView(PP_Instance pp_instance,
 
   if (info->last_size.width != position->size.width ||
       info->last_size.height != position->size.height) {
-    // Got a resize, repaint the plugin.
+    /* Got a resize, repaint the plugin. */
     Repaint(info, &position->size);
     info->last_size.width = position->size.width;
     info->last_size.height = position->size.height;
@@ -158,7 +160,7 @@ void Instance_DidChangeFocus(PP_Instance pp_instance, PP_Bool has_focus) {
 
 PP_Bool Instance_HandleInputEvent(PP_Instance pp_instance,
                                const struct PP_InputEvent* event) {
-  // We don't handle any events.
+  /* We don't handle any events. */
   return PP_FALSE;
 }
 
@@ -182,11 +184,11 @@ static struct PPP_Instance instance_interface = {
 };
 
 
-// Global entrypoints ----------------------------------------------------------
+/* Global entrypoints --------------------------------------------------------*/
 
 PP_EXPORT int32_t PPP_InitializeModule(PP_Module module,
                                        PPB_GetInterface get_browser_interface) {
-  // Save the global module information for later.
+  /* Save the global module information for later. */
   g_module_id = module;
   g_get_browser_interface = get_browser_interface;
 
@@ -213,3 +215,4 @@ PP_EXPORT const void* PPP_GetInterface(const char* interface_name) {
     return &instance_interface;
   return NULL;
 }
+