Cleanup|Fixed: Stray extern "C"

skyjake · Mar 25, 2012 · f261259 · f261259
1 parent 731cfa6
commit f261259
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 20 deletions.
diff --git a/doomsday/engine/api/dd_share.h b/doomsday/engine/api/dd_share.h
@@ -1827,7 +1827,7 @@ struct polyobj_s;
     } ddplayer_t;
 
 #ifdef __cplusplus
-}
+} // extern "C"
 #endif
 
 #endif /* LIBDENG_SHARED_H */
diff --git a/doomsday/engine/api/dd_types.h b/doomsday/engine/api/dd_types.h
@@ -221,4 +221,3 @@ struct material_s;
 #include "uri.h"
 
 #endif /* LIBDENG_TYPES_H */
-
diff --git a/doomsday/engine/api/doomsday.h b/doomsday/engine/api/doomsday.h
@@ -777,6 +777,7 @@ boolean M_IsStringValidFloat(const char* str);
 ///@}
 
 #ifdef __cplusplus
-}
+} // extern "C"
 #endif
+
 #endif /* LIBDENG_EXPORTS_H */
diff --git a/doomsday/engine/api/materialarchive.h b/doomsday/engine/api/materialarchive.h
@@ -99,7 +99,7 @@ void MaterialArchive_Read(MaterialArchive* arc, int forcedVersion, Reader* reade
 ///@}
 
 #ifdef __cplusplus
-}
+} // extern "C"
 #endif
 
 #endif // LIBDENG_MATERIALARCHIVE_H
diff --git a/doomsday/engine/portable/include/con_busy.h b/doomsday/engine/portable/include/con_busy.h
@@ -135,7 +135,7 @@ void BusyTask_End(BusyTask* task);
 void BusyTask_ExitWithValue(int result);
 
 #ifdef __cplusplus
-}
+} // extern "C"
 #endif
 
 #endif /// LIBDENG_CONSOLE_BUSY
diff --git a/doomsday/engine/portable/include/con_main.h b/doomsday/engine/portable/include/con_main.h
@@ -29,10 +29,6 @@
 #ifndef LIBDENG_CONSOLE_MAIN_H
 #define LIBDENG_CONSOLE_MAIN_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdio.h>
 #include "dd_share.h"
 #include "dd_types.h"

diff --git a/doomsday/engine/portable/include/dd_input.h b/doomsday/engine/portable/include/dd_input.h
@@ -300,7 +300,7 @@ void Rend_AllInputDeviceStateVisuals(void);
 #endif
 
 #ifdef __cplusplus
-}
+} // extern "C"
 #endif
 
 #endif /* LIBDENG_CORE_INPUT_H */
diff --git a/doomsday/engine/portable/include/dd_loop.h b/doomsday/engine/portable/include/dd_loop.h
@@ -96,7 +96,7 @@ void DD_SetGameLoopExitCode(int code);
 int DD_GameLoopExitCode(void);
 
 #ifdef __cplusplus
-}
+} // extern "C"
 #endif
 
 #endif
diff --git a/doomsday/engine/portable/include/dd_main.h b/doomsday/engine/portable/include/dd_main.h
@@ -29,10 +29,6 @@
 #ifndef LIBDENG_MAIN_H
 #define LIBDENG_MAIN_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "dd_types.h"
 #include "dd_plugin.h"
 #ifndef __cplusplus // Kludge: these aren't yet C++ compatible

diff --git a/doomsday/engine/portable/include/dd_pinit.h b/doomsday/engine/portable/include/dd_pinit.h
@@ -54,7 +54,7 @@ extern game_import_t gi;
 extern game_export_t gx;
 
 #ifdef __cplusplus
-}
+} // extern "C"
 #endif
 
 #endif /* LIBDENG_PORTABLE_INIT_H */
diff --git a/doomsday/engine/portable/include/displaymode.h b/doomsday/engine/portable/include/displaymode.h
@@ -115,7 +115,7 @@ boolean DisplayMode_IsEqual(const DisplayMode* a, const DisplayMode* b);
 int DisplayMode_Change(const DisplayMode* mode, boolean shouldCapture);
 
 #ifdef __cplusplus
-}
+} // extern "C"
 #endif
 
 #endif // LIBDENG_DISPLAYMODE_H
diff --git a/doomsday/engine/portable/include/r_data.h b/doomsday/engine/portable/include/r_data.h
@@ -35,6 +35,7 @@
 #include "thinker.h"
 #include "m_nodepile.h"
 #include "def_data.h"
+#include "textures.h"
 
 struct texture_s;
 struct font_s;

diff --git a/doomsday/engine/portable/include/textures.h b/doomsday/engine/portable/include/textures.h
@@ -43,13 +43,13 @@
 #ifndef LIBDENG_REFRESH_TEXTURES_H
 #define LIBDENG_REFRESH_TEXTURES_H
 
+/// Unique identifier associated with each texture name in the collection.
+typedef uint textureid_t;
+
 #include "dd_string.h"
 #include "dd_share.h"
 #include "uri.h"
 
-/// Unique identifier associated with each texture name in the collection.
-typedef uint textureid_t;
-
 /// Special value used to signify an invalid texture id.
 #define NOTEXTUREID                 0