Use a more descriptive name for when the files are used during our compilation. --- server/Makefile.am | 2 +- server/spice-audio.h | 2 +- server/spice-char.h | 2 +- server/spice-core.h | 4 ++-- server/spice-input.h | 2 +- server/spice-migration.h | 2 +- server/spice-server.h | 2 +- server/spice-version.h | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/server/Makefile.am b/server/Makefile.am index f162a18..e906636 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -2,7 +2,7 @@ NULL = SUBDIRS = . tests AM_CPPFLAGS = \ - -DSPICE_SERVER_INTERNAL \ + -DSPICE_COMPILATION \ -DRED_STATISTICS \ $(COMMON_CFLAGS) \ $(GLIB2_CFLAGS) \ diff --git a/server/spice-audio.h b/server/spice-audio.h index 3de4a8d..800f98d 100644 --- a/server/spice-audio.h +++ b/server/spice-audio.h @@ -18,7 +18,7 @@ #ifndef SPICE_AUDIO_H_ #define SPICE_AUDIO_H_ -#if !defined(SPICE_H_INSIDE) && !defined(SPICE_SERVER_INTERNAL) +#if !defined(SPICE_H_INSIDE) && !defined(SPICE_COMPILATION) #error "Only spice.h can be included directly." #endif diff --git a/server/spice-char.h b/server/spice-char.h index efd685d..f160254 100644 --- a/server/spice-char.h +++ b/server/spice-char.h @@ -18,7 +18,7 @@ #ifndef SPICE_CHAR_H_ #define SPICE_CHAR_H_ -#if !defined(SPICE_H_INSIDE) && !defined(SPICE_SERVER_INTERNAL) +#if !defined(SPICE_H_INSIDE) && !defined(SPICE_COMPILATION) #error "Only spice.h can be included directly." #endif diff --git a/server/spice-core.h b/server/spice-core.h index 4d8f2ed..5fbd9af 100644 --- a/server/spice-core.h +++ b/server/spice-core.h @@ -18,7 +18,7 @@ #ifndef SPICE_CORE_H_ #define SPICE_CORE_H_ -#if !defined(SPICE_H_INSIDE) && !defined(SPICE_SERVER_INTERNAL) +#if !defined(SPICE_H_INSIDE) && !defined(SPICE_COMPILATION) #error "Only spice.h can be included directly." #endif @@ -28,7 +28,7 @@ #include <spice/vd_agent.h> #include <spice/macros.h> -#ifdef SPICE_SERVER_INTERNAL +#ifdef SPICE_COMPILATION #undef SPICE_GNUC_DEPRECATED #define SPICE_GNUC_DEPRECATED #endif diff --git a/server/spice-input.h b/server/spice-input.h index dc07c4f..cd1ced4 100644 --- a/server/spice-input.h +++ b/server/spice-input.h @@ -18,7 +18,7 @@ #ifndef SPICE_INPUT_H_ #define SPICE_INPUT_H_ -#if !defined(SPICE_H_INSIDE) && !defined(SPICE_SERVER_INTERNAL) +#if !defined(SPICE_H_INSIDE) && !defined(SPICE_COMPILATION) #error "Only spice.h can be included directly." #endif diff --git a/server/spice-migration.h b/server/spice-migration.h index e2fc92e..03bb79c 100644 --- a/server/spice-migration.h +++ b/server/spice-migration.h @@ -18,7 +18,7 @@ #ifndef SPICE_MIGRATION_H_ #define SPICE_MIGRATION_H_ -#if !defined(SPICE_H_INSIDE) && !defined(SPICE_SERVER_INTERNAL) +#if !defined(SPICE_H_INSIDE) && !defined(SPICE_COMPILATION) #error "Only spice.h can be included directly." #endif diff --git a/server/spice-server.h b/server/spice-server.h index ac63a94..300996a 100644 --- a/server/spice-server.h +++ b/server/spice-server.h @@ -18,7 +18,7 @@ #ifndef SPICE_SERVER_H_ #define SPICE_SERVER_H_ -#if !defined(SPICE_H_INSIDE) && !defined(SPICE_SERVER_INTERNAL) +#if !defined(SPICE_H_INSIDE) && !defined(SPICE_COMPILATION) #error "Only spice.h can be included directly." #endif diff --git a/server/spice-version.h b/server/spice-version.h index b5c8eb0..340c365 100644 --- a/server/spice-version.h +++ b/server/spice-version.h @@ -18,7 +18,7 @@ #ifndef SPICE_VERSION_H_ #define SPICE_VERSION_H_ -#if !defined(SPICE_H_INSIDE) && !defined(SPICE_SERVER_INTERNAL) +#if !defined(SPICE_H_INSIDE) && !defined(SPICE_COMPILATION) #error "Only spice.h can be included directly." #endif -- 1.9.3 _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel