Prefer allegro5/allegro.h everywhere over allegro5/allegro5.h.

liballeg · Aug 5, 2010 · da2b5d9 · da2b5d9
1 parent 254eaea
commit da2b5d9
Show file tree

Hide file tree

Showing 230 changed files with 237 additions and 232 deletions.
diff --git a/addons/acodec/allegro5/allegro_acodec.h b/addons/acodec/allegro5/allegro_acodec.h
@@ -1,7 +1,7 @@
 #ifndef __al_included_allegro_acodec_h
 #define __al_included_allegro_acodec_h
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_audio.h"
 
 #ifdef __cplusplus

diff --git a/addons/acodec/flac.c b/addons/acodec/flac.c
@@ -5,7 +5,7 @@
  */
 
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_acodec.h"
 #include "allegro5/allegro_audio.h"
 #include "allegro5/internal/aintern.h"

diff --git a/addons/acodec/modaudio.c b/addons/acodec/modaudio.c
@@ -4,7 +4,7 @@
  */
 
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_acodec.h"
 #include "allegro5/allegro_audio.h"
 #include "allegro5/internal/aintern.h"

diff --git a/addons/acodec/ogg.c b/addons/acodec/ogg.c
@@ -4,7 +4,7 @@
  * author: Ryan Dickie (c) 2008
  */
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_acodec.h"
 #include "allegro5/allegro_audio.h"
 #include "allegro5/internal/aintern.h"

diff --git a/addons/audio/allegro5/allegro_audio.h b/addons/audio/allegro5/allegro_audio.h
@@ -13,7 +13,7 @@ extern "C" {
 /* Title: Audio types
  */
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 
 
 #if (defined ALLEGRO_MINGW32) || (defined ALLEGRO_MSVC) || (defined ALLEGRO_BCC32)

diff --git a/addons/audio/allegro5/internal/aintern_audio.h b/addons/audio/allegro5/internal/aintern_audio.h
@@ -5,7 +5,7 @@
 #ifndef AINTERN_AUDIO_H
 #define AINTERN_AUDIO_H
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/internal/aintern_vector.h"
 #include "../allegro_audio.h"
 

diff --git a/addons/audio/aqueue.m b/addons/audio/aqueue.m
@@ -17,7 +17,7 @@
 
 #include <stdio.h>
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/allegro_audio.h"
 #include "allegro5/internal/aintern_audio.h"

diff --git a/addons/audio/audio_io.c b/addons/audio/audio_io.c
@@ -2,7 +2,7 @@
  * Allegro audio codec table.
  */
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_audio.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/internal/aintern_audio.h"

diff --git a/addons/audio/kcm_dtor.c b/addons/audio/kcm_dtor.c
@@ -16,7 +16,7 @@
  */
 
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_audio.h"
 #include "allegro5/internal/aintern_dtor.h"
 #include "allegro5/internal/aintern_audio.h"

diff --git a/addons/audio/kcm_sample.c b/addons/audio/kcm_sample.c
@@ -18,7 +18,7 @@
 /* Title: Sample audio interface
  */
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_audio.h"
 #include "allegro5/internal/aintern_audio.h"
 #include "allegro5/internal/aintern_vector.h"

diff --git a/addons/color/allegro5/allegro_color.h b/addons/color/allegro5/allegro_color.h
@@ -1,4 +1,7 @@
-#include "allegro5/allegro5.h"
+#ifndef __al_included_allegro5_allegro_color_h
+#define __al_included_allegro5_allegro_color_h
+
+#include "allegro5/allegro.h"
 
 #if (defined ALLEGRO_MINGW32) || (defined ALLEGRO_MSVC) || (defined ALLEGRO_BCC32)
    #ifndef ALLEGRO_STATICLINK
@@ -61,3 +64,5 @@ ALLEGRO_COLOR_FUNC(ALLEGRO_COLOR, al_color_html, (char const *string));
 #ifdef __cplusplus
    }
 #endif
+
+#endif
diff --git a/addons/color/color.c b/addons/color/color.c
@@ -6,7 +6,7 @@
  * - CMYK (a bit like the opposite of RGB)
  * - YUV (the Y channel is quite useful for creating grayscale pictures)
  */
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_color.h"
 #include <math.h>
 #include <stdio.h>

diff --git a/addons/font/font.c b/addons/font/font.c
@@ -13,7 +13,7 @@
  */
 
 #include <string.h>
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/internal/aintern_vector.h"
 #include "allegro5/allegro_font.h"

diff --git a/addons/font/fontbmp.c b/addons/font/fontbmp.c
@@ -18,7 +18,7 @@
 
 #include <string.h>
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 
 #include "allegro5/allegro_font.h"
 

diff --git a/addons/font/text.c b/addons/font/text.c
@@ -21,7 +21,7 @@
 
 
 #include <math.h>
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 
 #include "allegro5/allegro_font.h"
 

diff --git a/addons/image/bmp.c b/addons/image/bmp.c
@@ -20,7 +20,7 @@
 
 #include <string.h>
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_image.h"
 #include "allegro5/internal/aintern_convert.h"
 #include "allegro5/internal/aintern_image.h"

diff --git a/addons/image/gdiplus.cpp b/addons/image/gdiplus.cpp
@@ -2,7 +2,7 @@
 #include <objidl.h>
 #include <gdiplus.h>
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_image.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/internal/aintern_convert.h"

diff --git a/addons/image/iio.c b/addons/image/iio.c
@@ -1,4 +1,4 @@
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_image.h"
 #include "allegro5/internal/aintern_image_cfg.h"
 #include "allegro5/internal/aintern_image.h"

diff --git a/addons/image/iphone.m b/addons/image/iphone.m
@@ -1,7 +1,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_image.h"
 #include "allegro5/internal/aintern_image.h"
 

diff --git a/addons/image/jpg.c b/addons/image/jpg.c
@@ -11,7 +11,7 @@
 
 #define BUFFER_SIZE 4096
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_image.h"
 #include "allegro5/internal/aintern_image.h"
 

diff --git a/addons/image/macosx.m b/addons/image/macosx.m
@@ -2,7 +2,7 @@
 #import <AppKit/NSImage.h>
 #import <AppKit/NSGraphicsContext.h>
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/fshook.h"
 #include "allegro5/allegro_image.h"
 #include "allegro5/internal/aintern_image.h"

diff --git a/addons/image/pcx.c b/addons/image/pcx.c
@@ -1,4 +1,4 @@
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_image.h"
 #include "allegro5/internal/aintern_image.h"
 

diff --git a/addons/image/png.c b/addons/image/png.c
@@ -5,7 +5,7 @@
 
 #include <png.h>
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_image.h"
 #include "allegro5/internal/aintern_image.h"
 

diff --git a/addons/image/tga.c b/addons/image/tga.c
@@ -22,7 +22,7 @@
  */
 
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_image.h"
 #include "allegro5/internal/aintern_image.h"
 #include "allegro5/internal/aintern_pixels.h"

diff --git a/addons/main/osx_main.m b/addons/main/osx_main.m
@@ -15,7 +15,7 @@
 *      See readme.txt for copyright information.
 */
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/internal/aintern.h"
 #include "allegro5/platform/aintosx.h"
 

diff --git a/addons/memfile/allegro5/memfile.h b/addons/memfile/allegro5/memfile.h
@@ -1,7 +1,7 @@
 #ifndef ALLEGRO_MEMFILE_H
 #define ALLEGRO_MEMFILE_H
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/addons/memfile/memfile.c b/addons/memfile/memfile.c
@@ -1,4 +1,4 @@
-#include <allegro5/allegro5.h>
+#include <allegro5/allegro.h>
 #include "allegro5/memfile.h"
 #include "allegro5/internal/aintern_file.h"
 

diff --git a/addons/native_dialog/allegro5/allegro_native_dialog.h b/addons/native_dialog/allegro5/allegro_native_dialog.h
@@ -1,7 +1,7 @@
 #ifndef __al_included_allegro_native_dialog_h
 #define __al_included_allegro_native_dialog_h
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 
 #ifdef __cplusplus
    extern "C" {

diff --git a/addons/native_dialog/dialog.c b/addons/native_dialog/dialog.c
@@ -1,4 +1,4 @@
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_native_dialog.h"
 #include "allegro5/internal/aintern_native_dialog.h"
 

diff --git a/addons/native_dialog/gtk_dialog.c b/addons/native_dialog/gtk_dialog.c
@@ -11,7 +11,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <pango/pango.h>
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_native_dialog.h"
 #include "allegro5/internal/aintern_native_dialog.h"
 

diff --git a/addons/native_dialog/osx_dialog.m b/addons/native_dialog/osx_dialog.m
@@ -1,4 +1,4 @@
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_native_dialog.h"
 #include "allegro5/internal/aintern_native_dialog.h"
 

diff --git a/addons/native_dialog/textlog.c b/addons/native_dialog/textlog.c
@@ -1,6 +1,6 @@
 #include <stdarg.h>
 #include <stdio.h>
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_native_dialog.h"
 #include "allegro5/internal/aintern_native_dialog.h"
 #include "allegro5/internal/aintern_native_dialog_cfg.h"

diff --git a/addons/native_dialog/win_dialog.c b/addons/native_dialog/win_dialog.c
@@ -8,7 +8,7 @@
  *
  */
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_native_dialog.h"
 #include "allegro5/internal/aintern_native_dialog.h"
 

diff --git a/addons/physfs/a5_physfs.c b/addons/physfs/a5_physfs.c
@@ -5,7 +5,7 @@
  */
 
 #include <physfs.h>
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_physfs.h"
 
 #include "allegro_physfs_intern.h"

diff --git a/addons/physfs/a5_physfs_dir.c b/addons/physfs/a5_physfs_dir.c
@@ -5,7 +5,7 @@
  */
 
 #include <physfs.h>
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_physfs.h"
 
 #include "allegro_physfs_intern.h"

diff --git a/addons/physfs/allegro5/allegro_physfs.h b/addons/physfs/allegro5/allegro_physfs.h
@@ -1,7 +1,7 @@
 #ifndef ALLEGRO_PHYSFS_H
 #define ALLEGRO_PHYSFS_H
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/addons/primitives/allegro5/allegro_primitives.h b/addons/primitives/allegro5/allegro_primitives.h
@@ -1,7 +1,7 @@
 #ifndef ALLEGRO_PRIMITIVES_H
 #define ALLEGRO_PRIMITIVES_H
 
-#include <allegro5/allegro5.h>
+#include <allegro5/allegro.h>
 
 #if (defined ALLEGRO_MINGW32) || (defined ALLEGRO_MSVC) || (defined ALLEGRO_BCC32)
 #ifndef ALLEGRO_STATICLINK

diff --git a/addons/primitives/prim_directx.c b/addons/primitives/prim_directx.c
@@ -17,7 +17,7 @@
  *      See readme.txt for copyright information.
  */
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_primitives.h"
 #include "allegro5/internal/aintern_bitmap.h"
 #include "allegro5/internal/aintern_prim_directx.h"

diff --git a/addons/primitives/prim_opengl.c b/addons/primitives/prim_opengl.c
@@ -16,7 +16,7 @@
  *      See readme.txt for copyright information.
  */
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_primitives.h"
 #include "allegro5/allegro_opengl.h"
 #include "allegro5/internal/aintern_prim_opengl.h"

diff --git a/addons/primitives/prim_soft.c b/addons/primitives/prim_soft.c
@@ -17,7 +17,7 @@
  */
 
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/internal/aintern_bitmap.h"
 
 #include "allegro5/allegro_primitives.h"

diff --git a/addons/primitives/primitives.c b/addons/primitives/primitives.c
@@ -16,7 +16,7 @@
  *      See readme.txt for copyright information.
  */
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_primitives.h"
 #include "allegro5/internal/aintern_prim_opengl.h"
 #include "allegro5/internal/aintern_prim_directx.h"

diff --git a/addons/ttf/allegro5/allegro_ttf.h b/addons/ttf/allegro5/allegro_ttf.h
@@ -1,4 +1,4 @@
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_font.h"
 
 #ifdef __cplusplus

diff --git a/addons/ttf/ttf.c b/addons/ttf/ttf.c
@@ -1,4 +1,4 @@
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/internal/aintern_vector.h"
 
 #include "allegro5/allegro_ttf.h"

diff --git a/demos/a5teroids/include/a5teroids.hpp b/demos/a5teroids/include/a5teroids.hpp
@@ -1,7 +1,7 @@
 #ifndef A5TEROIDS_HPP
 #define A5TEROIDS_HPP
 
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_image.h"
 #include "allegro5/allegro_font.h"
 #include "allegro5/allegro_acodec.h"

diff --git a/examples/ex_acodec.c b/examples/ex_acodec.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_audio.h"
 #include "allegro5/allegro_acodec.h"
 

diff --git a/examples/ex_acodec_multi.c b/examples/ex_acodec_multi.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include "allegro5/allegro5.h"
+#include "allegro5/allegro.h"
 #include "allegro5/allegro_audio.h"
 #include "allegro5/allegro_acodec.h"