Remove PG_VERSION

PostgresApp · Feb 8, 2018 · bf8689e · bf8689e
1 parent 1bea45d
commit bf8689e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/Postgres.xcodeproj/project.pbxproj b/Postgres.xcodeproj/project.pbxproj
@@ -654,7 +654,6 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
-					"PG_VERSION=\"$POSTGRES_VERSION\"",
 					"PG_MAJOR_VERSION=\"$POSTGRES_MAJOR_VERSION\"",
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
@@ -692,10 +691,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"PG_VERSION=\"$POSTGRES_VERSION\"",
-					"PG_MAJOR_VERSION=\"$POSTGRES_MAJOR_VERSION\"",
-				);
+				GCC_PREPROCESSOR_DEFINITIONS = "PG_MAJOR_VERSION=\"$POSTGRES_MAJOR_VERSION\"";
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;

diff --git a/Postgres/PostgresServer.m b/Postgres/PostgresServer.m
@@ -68,7 +68,7 @@ +(PostgresDataDirectoryStatus)statusOfDataDirectory:(NSString*)dir error:(NSErro
 	}
 
     NSString *dataDirectoryVersion = PGNormalizedVersionStringFromString([NSString stringWithContentsOfFile:versionFilePath encoding:NSUTF8StringEncoding error:nil]);
-    NSString *includedVersion = PGNormalizedVersionStringFromString([NSString stringWithUTF8String:xstr(PG_VERSION)]);
+    NSString *includedVersion = PGNormalizedVersionStringFromString([NSString stringWithUTF8String:xstr(PG_MAJOR_VERSION)]);
 
 	if ([includedVersion isEqual:dataDirectoryVersion]) {
 		return PostgresDataDirectoryCompatible;