From ffe065cd936ca5dc4f0d1243276964f2dbd60840 Mon Sep 17 00:00:00 2001
From: J2ObjC Team <j2objc-copybara@google.com>
Date: Tue, 16 Jun 2026 09:14:14 -0700
Subject: [PATCH] Internal change

PiperOrigin-RevId: 933124158
---
 .../src/google/protobuf/compiler/j2objc/j2objc_enum.cc        | 4 ++--
 .../google/devtools/j2objc/gen/TypeDeclarationGenerator.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_enum.cc b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_enum.cc
index 501374c132..507a42ae22 100644
--- a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_enum.cc
+++ b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_enum.cc
@@ -117,7 +117,7 @@ void EnumGenerator::GenerateHeader(io::Printer* printer) {
       "\n// Java enum ordinal preprocessor name that allows for stricter enum "
       "types\n"
       "// outside transpiled code.\n"
-      "#if J2OBJC_IMPORTED_BY_JAVA_IMPLEMENTATION\n"
+      "#if defined(J2OBJC_IMPORTED_BY_JAVA_IMPLEMENTATION) && J2OBJC_IMPORTED_BY_JAVA_IMPLEMENTATION\n"
       "#define $ordinalpreprocessorname$ jint\n"
       "#else\n"
       "#define $ordinalpreprocessorname$ $ordinalenumname$\n"
@@ -149,7 +149,7 @@ void EnumGenerator::GenerateHeader(io::Printer* printer) {
       "\n// Java enum value preprocessor name that allows for stricter enum "
       "types\n"
       "// outside transpiled code.\n"
-      "#if J2OBJC_IMPORTED_BY_JAVA_IMPLEMENTATION\n"
+      "#if defined(J2OBJC_IMPORTED_BY_JAVA_IMPLEMENTATION) && J2OBJC_IMPORTED_BY_JAVA_IMPLEMENTATION\n"
       "#define $valuepreprocessorname$ jint\n"
       "#else\n"
       "#define $valuepreprocessorname$ $valueenumname$\n"
diff --git a/translator/src/main/java/com/google/devtools/j2objc/gen/TypeDeclarationGenerator.java b/translator/src/main/java/com/google/devtools/j2objc/gen/TypeDeclarationGenerator.java
index 838e8acdef..dea6e3cd02 100644
--- a/translator/src/main/java/com/google/devtools/j2objc/gen/TypeDeclarationGenerator.java
+++ b/translator/src/main/java/com/google/devtools/j2objc/gen/TypeDeclarationGenerator.java
@@ -239,7 +239,7 @@ private void printNativeEnum() {
       // Use different types for transpiled Java ordinals (which expects ordinals to be int32_t) and
       // native code using the enum (where stricter ordinal types help clang warnings).
       printf(
-          "#if J2OBJC_IMPORTED_BY_JAVA_IMPLEMENTATION\n"
+          "#if defined(J2OBJC_IMPORTED_BY_JAVA_IMPLEMENTATION) && J2OBJC_IMPORTED_BY_JAVA_IMPLEMENTATION\n"
               + "#define %s int32_t\n"
               + "#else\n"
               + "#define %s %s\n"