From 5f3d8bc6348c25734b4e7fb54f31596e0206828f Mon Sep 17 00:00:00 2001
From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
Date: Tue, 16 Feb 2021 11:23:45 +0100
Subject: Include <config.h> when possible - continued.

---
 src/fl_encoding_mac_roman.cxx | 35 ++++++++---------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)

(limited to 'src/fl_encoding_mac_roman.cxx')

diff --git a/src/fl_encoding_mac_roman.cxx b/src/fl_encoding_mac_roman.cxx
index 234a908d8..75439a3ee 100644
--- a/src/fl_encoding_mac_roman.cxx
+++ b/src/fl_encoding_mac_roman.cxx
@@ -1,7 +1,7 @@
 //
 // Convert Mac Roman encoded text to the local encoding.
 //
-// Copyright 1998-2016 by Bill Spitzak and others.
+// Copyright 1998-2021 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -14,7 +14,7 @@
 //     https://www.fltk.org/bugs.php
 //
 
-#include "config_lib.h"
+#include <config.h>
 #include <FL/fl_draw.H>
 #include "Fl_System_Driver.H"
 #include <FL/Fl.H>
@@ -22,31 +22,18 @@
 #include <stdlib.h>
 #include "flstring.h"
 
+/**
+ \cond DriverDev
+ \addtogroup DriverDeveloper
+ \{
+ */
+
 // These function assume a western code page.
 //
-// On Mac OS X, nothing need to be converted. We simply return the
-// original pointer.
-//
 // Windows and X11 render text in ISO or Latin-1 for western settings. The
 // lookup tables below will convert all common character codes and replace
 // unknown characters with an upsidedown question mark.
 
-#ifdef FL_CFG_WIN_COCOA
-
-#  include "drivers/Darwin/Fl_Darwin_System_Driver.H"
-
-const char *Fl_Darwin_System_Driver::mac_roman_to_local(const char *t, int)
-{
-  return t;
-}
-
-const char *Fl_Darwin_System_Driver::local_to_mac_roman(const char *t, int)
-{
-  return t;
-}
-
-#endif
-
 // This table converts Windows-1252/Latin 1 into MacRoman encoding
 static uchar latin2roman[128] = {
 0xdb, 0xc0, 0xe2, 0xc4, 0xe3, 0xc9, 0xa0, 0xe0, 0xf6, 0xe4, 0xc0, 0xdc, 0xce, 0xc0, 0xc0, 0xc0,
@@ -74,12 +61,6 @@ static uchar roman2latin[128] = {
 static char *buf = 0;
 static int n_buf = 0;
 
-/**
- \cond DriverDev
- \addtogroup DriverDeveloper
- \{
- */
-
 const char *Fl_System_Driver::local_to_mac_roman(const char *t, int n)
 {
   if (n==-1) n = (int) strlen(t);
-- 
cgit v1.2.3