(keni, for jhsa)

here are two minor patches for amigaport (ppc/gcc related, compiletime).
Teemu noticed these during a testcompile for 341 tarball today.

-jhsa

*** sys/amiga/amidos.p	2003/02/20 15:36:28	1.1
--- sys/amiga/amidos.p	2003/02/20 14:30:12
***************
*** 37,42 ****
  #ifndef	strcmpi
  int FDECL(strcmpi, (char * , char *));
  #endif
! #if !defined(memcmp) && !defined(AZTEC_C) && !defined(_DCC)
  int FDECL(memcmp, (unsigned char * , unsigned char * , int ));
  #endif
--- 37,42 ----
  #ifndef	strcmpi
  int FDECL(strcmpi, (char * , char *));
  #endif
! #if !defined(memcmp) && !defined(AZTEC_C) && !defined(_DCC) && !defined(__GNUC__)
  int FDECL(memcmp, (unsigned char * , unsigned char * , int ));
  #endif
*** sys/amiga/amiwind.c	2000/11/30 16:39:25	1.3
--- sys/amiga/amiwind.c	2003/02/20 14:31:06
***************
*** 21,31 ****

  #define BufferQueueChar(ch) (KbdBuffer[KbdBuffered++] = (ch))

- #ifdef __GNUC__ /* Conflicting includefiles ... */
- struct Device *ConsoleDevice;
- #else
  struct Library *ConsoleDevice;
- #endif

  #include "NH:sys/amiga/amimenu.c"

--- 21,27 ----

diff --git a/sys/amiga/amidos.p b/sys/amiga/amidos.p
index 86c355dbf24ad20e2521cd9e318fcce09c60b45c..ee91b3a8143010e02f7c13280bb2f75776faf7ff 100644 (file)
--- a/sys/amiga/amidos.p
+++ b/sys/amiga/amidos.p
@@ -37,6 +37,6 @@ int FDECL(chdir, (char *));
 #ifndef        strcmpi
 int FDECL(strcmpi, (char * , char *));
 #endif
-#if !defined(memcmp) && !defined(AZTEC_C) && !defined(_DCC)
+#if !defined(memcmp) && !defined(AZTEC_C) && !defined(_DCC) && !defined(__GNUC__)
 int FDECL(memcmp, (unsigned char * , unsigned char * , int ));
 #endif

diff --git a/sys/amiga/amiwind.c b/sys/amiga/amiwind.c
index fab7f722e87c5502b076c8f2e9e2f23972890046..860bc3c287d4058f815f7fa0293850d5e66c9678 100644 (file)
--- a/sys/amiga/amiwind.c
+++ b/sys/amiga/amiwind.c
@@ -21,11 +21,7 @@ static void ProcessMessage( register struct IntuiMessage *message );
 
 #define BufferQueueChar(ch) (KbdBuffer[KbdBuffered++] = (ch))
 
-#ifdef __GNUC__ /* Conflicting includefiles ... */
-struct Device *ConsoleDevice;
-#else
 struct Library *ConsoleDevice;
-#endif
 
 #include "NH:sys/amiga/amimenu.c"