okay, I have no idea why they don't like gcc4.
make it compile, not fuck up the build.
This commit is contained in:
parent
7b32d1a198
commit
dcf15ebf62
@ -1,17 +1,12 @@
|
|||||||
$OpenBSD: patch-config_h_in,v 1.3 2008/08/25 15:14:43 jasper Exp $
|
$OpenBSD: patch-config_h_in,v 1.4 2010/05/20 09:21:17 espie Exp $
|
||||||
--- config.h.in.orig Sat Jan 24 07:30:27 2004
|
--- config.h.in.orig Sat Jan 24 07:30:27 2004
|
||||||
+++ config.h.in Sat Aug 23 18:04:36 2008
|
+++ config.h.in Wed May 19 18:54:23 2010
|
||||||
@@ -1,7 +1,8 @@
|
@@ -1,4 +1,5 @@
|
||||||
/* config.h.in. Generated from configure.in by autoheader. */
|
/* config.h.in. Generated from configure.in by autoheader. */
|
||||||
+#undef HAVE_LIBPTHREAD
|
+#undef HAVE_LIBPTHREAD
|
||||||
|
|
||||||
-/* Define to 1 if you have the <db.h> header file. */
|
/* Define to 1 if you have the <db.h> header file. */
|
||||||
-#undef HAVE_DB_H
|
#undef HAVE_DB_H
|
||||||
+/* Define to 1 if you have the <db/db.h> header file. */
|
|
||||||
+#undef HAVE_DB_DB_H
|
|
||||||
|
|
||||||
/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
|
|
||||||
*/
|
|
||||||
@@ -22,6 +23,12 @@
|
@@ -22,6 +23,12 @@
|
||||||
/* Define to 1 if you have the `getcwd' function. */
|
/* Define to 1 if you have the `getcwd' function. */
|
||||||
#undef HAVE_GETCWD
|
#undef HAVE_GETCWD
|
||||||
|
@ -1,7 +1,18 @@
|
|||||||
$OpenBSD: patch-configure_in,v 1.4 2008/08/31 12:29:25 jasper Exp $
|
$OpenBSD: patch-configure_in,v 1.5 2010/05/20 09:21:17 espie Exp $
|
||||||
--- configure.in.orig Fri Jan 9 19:17:46 2004
|
--- configure.in.orig Fri Jan 9 19:17:46 2004
|
||||||
+++ configure.in Sun Aug 24 13:24:50 2008
|
+++ configure.in Thu May 20 11:18:39 2010
|
||||||
@@ -117,6 +117,7 @@ if test "x$have_gcrypt" != "xyes"; then
|
@@ -56,10 +56,8 @@ programs. If you get compile errors, first upgrade to
|
||||||
|
(but minimum 2.96-85) and try again. If the problem still exists, try with
|
||||||
|
gcc 3.0.x (or 2.95.x) *BEFORE* reporting bugs!
|
||||||
|
|
||||||
|
-Press return to resume configuration (CTRL-C to abort).
|
||||||
|
================================================================================
|
||||||
|
EOF
|
||||||
|
- read dummy
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
@@ -117,6 +115,7 @@ if test "x$have_gcrypt" != "xyes"; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -9,7 +20,7 @@ $OpenBSD: patch-configure_in,v 1.4 2008/08/31 12:29:25 jasper Exp $
|
|||||||
|
|
||||||
dnl Checks for libraries.
|
dnl Checks for libraries.
|
||||||
AC_ARG_ENABLE(glib2,[ --disable-glib2 Use glib1.2 instead of glib 2.x])
|
AC_ARG_ENABLE(glib2,[ --disable-glib2 Use glib1.2 instead of glib 2.x])
|
||||||
@@ -258,7 +259,7 @@ else
|
@@ -258,7 +257,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_MSG_CHECKING(whether MSG_NOSIGNAL exists)
|
AC_MSG_CHECKING(whether MSG_NOSIGNAL exists)
|
||||||
@ -18,7 +29,7 @@ $OpenBSD: patch-configure_in,v 1.4 2008/08/31 12:29:25 jasper Exp $
|
|||||||
[
|
[
|
||||||
int main()
|
int main()
|
||||||
{
|
{
|
||||||
@@ -310,7 +311,7 @@ fi
|
@@ -310,7 +309,7 @@ fi
|
||||||
dnl Checks for header files.
|
dnl Checks for header files.
|
||||||
AC_HEADER_DIRENT
|
AC_HEADER_DIRENT
|
||||||
AC_HEADER_STDC
|
AC_HEADER_STDC
|
||||||
@ -27,7 +38,7 @@ $OpenBSD: patch-configure_in,v 1.4 2008/08/31 12:29:25 jasper Exp $
|
|||||||
|
|
||||||
dnl Checks for typedefs, structures, and compiler characteristics.
|
dnl Checks for typedefs, structures, and compiler characteristics.
|
||||||
AC_C_CONST
|
AC_C_CONST
|
||||||
@@ -323,7 +324,7 @@ AC_STRUCT_TM
|
@@ -323,7 +322,7 @@ AC_STRUCT_TM
|
||||||
dnl Checks for library functions.
|
dnl Checks for library functions.
|
||||||
AC_FUNC_MEMCMP
|
AC_FUNC_MEMCMP
|
||||||
AC_FUNC_MMAP
|
AC_FUNC_MMAP
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
$OpenBSD: patch-src_main_c,v 1.3 2008/08/25 15:14:43 jasper Exp $
|
$OpenBSD: patch-src_main_c,v 1.4 2010/05/20 09:21:17 espie Exp $
|
||||||
--- src/main.c.orig Sun Dec 28 09:12:38 2003
|
--- src/main.c.orig Sun Dec 28 09:12:38 2003
|
||||||
+++ src/main.c Sun Aug 24 13:23:35 2008
|
+++ src/main.c Wed May 19 18:54:18 2010
|
||||||
@@ -43,7 +43,9 @@ $Id: patch-src_main_c,v 1.3 2008/08/25 15:14:43 jasper Exp $
|
@@ -43,7 +43,9 @@ $Id: patch-src_main_c,v 1.4 2010/05/20 09:21:17 espie Exp $
|
||||||
#include <sys/sem.h>
|
#include <sys/sem.h>
|
||||||
#endif
|
#endif
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
$OpenBSD: patch-src_sema_c,v 1.2 2008/08/25 15:14:43 jasper Exp $
|
$OpenBSD: patch-src_sema_c,v 1.3 2010/05/20 09:21:17 espie Exp $
|
||||||
--- src/sema.c.orig Sun Dec 28 09:12:38 2003
|
--- src/sema.c.orig Sun Dec 28 09:12:38 2003
|
||||||
+++ src/sema.c Fri Aug 22 20:32:04 2008
|
+++ src/sema.c Wed May 19 18:54:18 2010
|
||||||
@@ -41,7 +41,7 @@ $Id: patch-src_sema_c,v 1.2 2008/08/25 15:14:43 jasper Exp $
|
@@ -41,7 +41,7 @@ $Id: patch-src_sema_c,v 1.3 2010/05/20 09:21:17 espie Exp $
|
||||||
|
|
||||||
#include "sema.h"
|
#include "sema.h"
|
||||||
|
|
||||||
|
16
net/dctc/patches/patch-src_user_manage_h
Normal file
16
net/dctc/patches/patch-src_user_manage_h
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
$OpenBSD: patch-src_user_manage_h,v 1.1 2010/05/20 09:21:17 espie Exp $
|
||||||
|
--- src/user_manage.h.orig Thu May 20 11:19:29 2010
|
||||||
|
+++ src/user_manage.h Thu May 20 11:19:58 2010
|
||||||
|
@@ -27,12 +27,6 @@ $Id: user_manage.h,v 1.2 2003/12/28 08:12:38 uid68112
|
||||||
|
extern GPtrArray *hub_user_list; /* list of all users connected to the hub */
|
||||||
|
extern GPtrArray *hub_op_list; /* list of all ops connected to the hub (ops are also in the user_list) */
|
||||||
|
|
||||||
|
-extern GPtrArray *hub_user_xtra_info; /* array of extra data stored for each hub user */
|
||||||
|
- /* the nth pointer of this array is for the nth user of the hub_user_list */
|
||||||
|
- /* a user having no extra info has a null pointer as extra info */
|
||||||
|
-
|
||||||
|
-extern GPtrArray *hub_user_uinfo; /* it is the result of /UINFO command for each user */
|
||||||
|
-
|
||||||
|
typedef enum
|
||||||
|
{
|
||||||
|
UNDEFINED=0,
|
Loading…
x
Reference in New Issue
Block a user