mirror of
https://github.com/brl/mutter.git
synced 2025-08-02 14:44:40 +00:00
cleanup: Make include macro usages consistent
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3157>
This commit is contained in:

committed by
Marge Bot

parent
e0ed157e5d
commit
a955f0e47c
@@ -31,8 +31,8 @@
|
||||
#include <glib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "cogl-pango-display-list.h"
|
||||
#include "cogl-pango-pipeline-cache.h"
|
||||
#include "cogl-pango/cogl-pango-display-list.h"
|
||||
#include "cogl-pango/cogl-pango-pipeline-cache.h"
|
||||
#include "cogl/cogl-context-private.h"
|
||||
|
||||
typedef enum
|
||||
|
@@ -29,7 +29,8 @@
|
||||
#pragma once
|
||||
|
||||
#include <glib.h>
|
||||
#include "cogl-pango-pipeline-cache.h"
|
||||
|
||||
#include "cogl-pango/cogl-pango-pipeline-cache.h"
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
|
@@ -38,9 +38,9 @@
|
||||
#include <pango/pangocairo.h>
|
||||
#include <pango/pango-renderer.h>
|
||||
|
||||
#include "cogl-pango.h"
|
||||
#include "cogl-pango-private.h"
|
||||
#include "cogl-util.h"
|
||||
#include "cogl-pango/cogl-pango.h"
|
||||
#include "cogl-pango/cogl-pango-private.h"
|
||||
#include "cogl/cogl-util.h"
|
||||
#include "cogl/cogl-context-private.h"
|
||||
|
||||
static GQuark cogl_pango_font_map_get_priv_key (void) G_GNUC_CONST;
|
||||
|
@@ -30,8 +30,8 @@
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include "cogl-pango-glyph-cache.h"
|
||||
#include "cogl-pango-private.h"
|
||||
#include "cogl-pango/cogl-pango-glyph-cache.h"
|
||||
#include "cogl-pango/cogl-pango-private.h"
|
||||
#include "cogl/cogl-atlas.h"
|
||||
#include "cogl/cogl-atlas-texture-private.h"
|
||||
|
||||
|
@@ -34,8 +34,8 @@
|
||||
#include "cogl-config.h"
|
||||
|
||||
#include <glib.h>
|
||||
#include "cogl-pango-pipeline-cache.h"
|
||||
|
||||
#include "cogl-pango/cogl-pango-pipeline-cache.h"
|
||||
#include "cogl/cogl-context-private.h"
|
||||
#include "cogl/cogl-texture-private.h"
|
||||
|
||||
|
@@ -35,7 +35,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "cogl-pango.h"
|
||||
#include "cogl-pango/cogl-pango.h"
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
|
@@ -55,9 +55,9 @@
|
||||
#include "cogl/cogl-debug.h"
|
||||
#include "cogl/cogl-context-private.h"
|
||||
#include "cogl/cogl-texture-private.h"
|
||||
#include "cogl-pango-private.h"
|
||||
#include "cogl-pango-glyph-cache.h"
|
||||
#include "cogl-pango-display-list.h"
|
||||
#include "cogl-pango/cogl-pango-private.h"
|
||||
#include "cogl-pango/cogl-pango-glyph-cache.h"
|
||||
#include "cogl-pango/cogl-pango-display-list.h"
|
||||
|
||||
enum
|
||||
{
|
||||
|
@@ -47,7 +47,7 @@
|
||||
* or specific internal cogl headers here...
|
||||
*/
|
||||
#ifndef COGL_COMPILATION
|
||||
#include <cogl/cogl.h>
|
||||
#include "cogl/cogl.h"
|
||||
#else
|
||||
#include "cogl/cogl-context.h"
|
||||
#include "cogl/cogl-macros.h"
|
||||
|
Reference in New Issue
Block a user