瀏覽代碼

fixed ordering of includes in ckutio.c

Thorsten Hohmeier 21 年之前
父節點
當前提交
9e490c8cdd
共有 2 個文件被更改,包括 62 次插入1 次删除
  1. 59 0
      kermit/kermit.patch
  2. 3 1
      kermit/kermit.spec

+ 59 - 0
kermit/kermit.patch

@@ -0,0 +1,59 @@
+--- ckutio.c.orig	2004-06-01 12:20:41.000000000 +0200
++++ ckutio.c	2004-06-01 12:22:13.000000000 +0200
+@@ -301,6 +301,28 @@
+ #include <sys/stat.h>
+ #endif /* CIE */
+ 
++/* Whether to include <fcntl.h> */
++/* we should define open() before usage (baudboy.h) */
++
++#ifndef is68k				/* Only a few don't have this one. */
++#ifndef BSD41
++#ifndef FT21
++#ifndef FT18
++#ifndef COHERENT
++#include <fcntl.h>
++#endif /* COHERENT */
++#endif /* FT18 */
++#endif /* FT21 */
++#endif /* BSD41 */
++#endif /* not is68k */
++
++#ifdef COHERENT
++#ifdef _I386
++#include <fcntl.h>
++#else
++#include <sys/fcntl.h>
++#endif /* _I386 */
++#endif /* COHERENT */
+ /* UUCP lockfile material... */
+ 
+ #ifndef NOUUCP
+@@ -779,27 +801,6 @@
+ #endif /* FIONREAD */
+ #endif /* XENIX */
+ 
+-/* Whether to include <fcntl.h> */
+-
+-#ifndef is68k				/* Only a few don't have this one. */
+-#ifndef BSD41
+-#ifndef FT21
+-#ifndef FT18
+-#ifndef COHERENT
+-#include <fcntl.h>
+-#endif /* COHERENT */
+-#endif /* FT18 */
+-#endif /* FT21 */
+-#endif /* BSD41 */
+-#endif /* not is68k */
+-
+-#ifdef COHERENT
+-#ifdef _I386
+-#include <fcntl.h>
+-#else
+-#include <sys/fcntl.h>
+-#endif /* _I386 */
+-#endif /* COHERENT */
+ 
+ #ifdef ATT7300				/* Unix PC, internal modem dialer */
+ #include <sys/phone.h>

+ 3 - 1
kermit/kermit.spec

@@ -38,7 +38,7 @@ Class:        BASE
 Group:        Communication
 License:      GPL
 Version:      %{V_major}.%{V_minor}
-Release:      20040412
+Release:      20040601
 
 #   package options
 %option       with_fsl  yes
@@ -47,6 +47,7 @@ Release:      20040412
 Source0:      ftp://kermit.columbia.edu/kermit/archives/cku%{V_minor}.tar.gz
 Source1:      rc.kermit
 Source2:      fsl.kermit
+Patch0:       kermit.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -76,6 +77,7 @@ AutoReqProv:  no
 
 %prep
     %setup -q -c
+    %patch -p0
 
 %build
     %{l_shtool} subst \