From d03529067aaf3898d2e2f1ce42ca90e5f7f2f822 Mon Sep 17 00:00:00 2001
From: Colin Leroy-Mira <colin@colino.net>
Date: Sat, 31 May 2025 13:27:52 +0200
Subject: [PATCH] Apple2: don't define _allow_lowercase and uppercasemask on
 APPLE2ENH

---
 libsrc/apple2/allow_lowercase.s | 7 ++++++-
 libsrc/apple2/uppercasemask.s   | 9 ++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/libsrc/apple2/allow_lowercase.s b/libsrc/apple2/allow_lowercase.s
index 648276b4c..b78544a66 100644
--- a/libsrc/apple2/allow_lowercase.s
+++ b/libsrc/apple2/allow_lowercase.s
@@ -4,8 +4,11 @@
 ; unsigned char __fastcall__ allow_lowercase (unsigned char onoff);
 ;
 
+.ifndef __APPLE2ENH__
+
         .export         _allow_lowercase
-        .import         uppercasemask, return0, return1
+        .import         return0
+        .import         uppercasemask, return1
 
 _allow_lowercase:
         tax
@@ -21,3 +24,5 @@ _allow_lowercase:
 
 values: .byte   $DF         ; Force uppercase
         .byte   $FF         ; Keep lowercase
+
+.endif
diff --git a/libsrc/apple2/uppercasemask.s b/libsrc/apple2/uppercasemask.s
index b0f05eee7..cd818c5bf 100644
--- a/libsrc/apple2/uppercasemask.s
+++ b/libsrc/apple2/uppercasemask.s
@@ -2,14 +2,12 @@
 ; Oliver Schmidt, 2024-08-06
 ;
 
+.ifndef __APPLE2ENH__
+
         .export         uppercasemask
 
-        .ifndef __APPLE2ENH__
         .import         machinetype
         .constructor    detectlowercase
-        .endif
-
-        .ifndef __APPLE2ENH__
 
         .segment "ONCE"
 
@@ -21,8 +19,9 @@ detectlowercase:
         sta     uppercasemask
 :       rts
 
-        .endif
 
         .data
 
 uppercasemask:  .byte   $DF     ; Convert to uppercase
+
+.endif