From 88b7ac1c52ecf0150b5437dffc3f349f1d6db716 Mon Sep 17 00:00:00 2001 From: redcode Date: Fri, 11 Sep 2015 06:24:46 +0200 Subject: [PATCH] Namespace conventions. --- Z80.CPU/v1.0/API/C/emulation/CPU/Z80.h | 10 +++++----- .../development/Xcode/Z80.xcodeproj/project.pbxproj | 4 ++-- Z80.CPU/v1.0/sources/Z80.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Z80.CPU/v1.0/API/C/emulation/CPU/Z80.h b/Z80.CPU/v1.0/API/C/emulation/CPU/Z80.h index 108a7b2..08225e3 100644 --- a/Z80.CPU/v1.0/API/C/emulation/CPU/Z80.h +++ b/Z80.CPU/v1.0/API/C/emulation/CPU/Z80.h @@ -13,15 +13,15 @@ Released under the terms of the GNU General Public License v3. */ #include #include -#ifndef EMULATION_CPU_Z80_NO_SLOTS +#ifndef CPU_Z80_NO_SLOTS # include #endif -#if defined(BUILDING_DYNAMIC_EMULATION_CPU_Z80) +#if defined(CPU_Z80_BUILDING_DYNAMIC) # define CPU_Z80_API Z_API_EXPORT -#elif defined(BUILDING_STATIC_EMULATION_CPU_Z80) +#elif defined(CPU_Z80_BUILDING_STATIC) # define CPU_Z80_API Z_PUBLIC -#elif defined(USE_STATIC_EMULATION_CPU_Z80) +#elif defined(CPU_Z80_USE_STATIC) # define CPU_Z80_API #else # define CPU_Z80_API Z_API @@ -34,7 +34,7 @@ typedef struct { zuint8 r7; Z32Bit data; -# ifdef EMULATION_CPU_Z80_NO_SLOTS +# ifdef CPU_Z80_NO_SLOTS void* cb_context; struct {Z16BitAddressRead8Bit read; diff --git a/Z80.CPU/v1.0/development/Xcode/Z80.xcodeproj/project.pbxproj b/Z80.CPU/v1.0/development/Xcode/Z80.xcodeproj/project.pbxproj index b249997..6ec6ca2 100644 --- a/Z80.CPU/v1.0/development/Xcode/Z80.xcodeproj/project.pbxproj +++ b/Z80.CPU/v1.0/development/Xcode/Z80.xcodeproj/project.pbxproj @@ -8,8 +8,8 @@ /* Begin PBXBuildFile section */ 6428A5751AAFC6DF00634F5D /* Z80.h in Headers */ = {isa = PBXBuildFile; fileRef = 6428A5741AAFC6DF00634F5D /* Z80.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 6428A5771AAFC72900634F5D /* Z80.c in Sources */ = {isa = PBXBuildFile; fileRef = 6428A5761AAFC72900634F5D /* Z80.c */; settings = {COMPILER_FLAGS = "-DBUILDING_DYNAMIC_EMULATION_CPU_Z80 -DEMULATION_CPU_Z80_NO_SLOTS"; }; }; - 6428A5801AAFEF1D00634F5D /* Z80.c in Sources */ = {isa = PBXBuildFile; fileRef = 6428A5761AAFC72900634F5D /* Z80.c */; settings = {COMPILER_FLAGS = "-DBUILDING_STATIC_EMULATION_CPU_Z80 -DEMULATION_CPU_Z80_NO_SLOTS"; }; }; + 6428A5771AAFC72900634F5D /* Z80.c in Sources */ = {isa = PBXBuildFile; fileRef = 6428A5761AAFC72900634F5D /* Z80.c */; settings = {COMPILER_FLAGS = "-DCPU_Z80_BUILDING_DYNAMIC -DCPU_Z80_NO_SLOTS"; }; }; + 6428A5801AAFEF1D00634F5D /* Z80.c in Sources */ = {isa = PBXBuildFile; fileRef = 6428A5761AAFC72900634F5D /* Z80.c */; settings = {COMPILER_FLAGS = "-DCPU_Z80_BUILDING_STATIC -DCPU_Z80_NO_SLOTS"; }; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ diff --git a/Z80.CPU/v1.0/sources/Z80.c b/Z80.CPU/v1.0/sources/Z80.c index f0e5175..440f4bc 100644 --- a/Z80.CPU/v1.0/sources/Z80.c +++ b/Z80.CPU/v1.0/sources/Z80.c @@ -22,7 +22,7 @@ typedef zuint8 (* Instruction)(Z80 *object); /* MARK: - Macros & Functions: Callback */ -#ifdef EMULATION_CPU_Z80_NO_SLOTS +#ifdef CPU_Z80_NO_SLOTS # define CB_ACTION(name) object->cb.name # define CB_OBJECT(name) object->cb_context #else @@ -1575,7 +1575,7 @@ CPU_Z80_API void z80_nmi(Z80 *object) {NMI = TRUE ;} CPU_Z80_API void z80_irq(Z80 *object, zboolean state) {INT = state;} -#ifdef BUILDING_MODULE_EMULATION_CPU_Z80 +#ifdef CPU_Z80_BUILDING_MODULE Z_PRIVATE void after_state_readed (Z80 *object, ZZ80State *state) {Z_Z80_STATE_R(state) = R_ALL;}