From 057ceb6137dac25b1deb0317b06678fbf777a19c Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 17 Sep 2004 16:34:13 +0000 Subject: [PATCH] - fixed issues when compiling with gcc-2.95.3. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8994 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/network/interfaces/ppp/PPPManager.cpp | 2 +- src/apps/showimage/PrintOptionsWindow.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/add-ons/kernel/network/interfaces/ppp/PPPManager.cpp b/src/add-ons/kernel/network/interfaces/ppp/PPPManager.cpp index 344f5fd7fd..c5fc4da088 100644 --- a/src/add-ons/kernel/network/interfaces/ppp/PPPManager.cpp +++ b/src/add-ons/kernel/network/interfaces/ppp/PPPManager.cpp @@ -359,7 +359,7 @@ PPPManager::RegisterInterface(ppp_interface_id ID) memset(ifp, 0, sizeof(ifnet)); ifp->devid = -1; ifp->if_type = IFT_PPP; - ifp->name = sKPPPIfNameBase; + ifp->name = (char*)sKPPPIfNameBase; ifp->if_unit = FindUnit(); ifp->if_flags = IFF_POINTOPOINT; ifp->rx_thread = ifp->tx_thread = -1; diff --git a/src/apps/showimage/PrintOptionsWindow.h b/src/apps/showimage/PrintOptionsWindow.h index 80b51651fb..acd5a632f3 100644 --- a/src/apps/showimage/PrintOptionsWindow.h +++ b/src/apps/showimage/PrintOptionsWindow.h @@ -52,8 +52,8 @@ public: BRect Bounds() const { return fBounds; } void SetBounds(BRect bounds); - Option Option() const { return fOption; } - void SetOption(Option op) { fOption = op; } + enum Option Option() const { return fOption; } + void SetOption(enum Option op) { fOption = op; } // zoomFactor = 72.0 / dpi float ZoomFactor() const { return fZoomFactor; } void SetZoomFactor(float z); @@ -67,7 +67,7 @@ public: private: BRect fBounds; - Option fOption; + enum Option fOption; float fZoomFactor; float fDPI; float fWidth, fHeight; // 1/72 Inches