[GNUnet-SVN] r15653 - in monkey/src: include monkey

[gnunet]

Author: grothoff
Date: 2011-06-16 13:09:11 +0200 (Thu, 16 Jun 2011)
New Revision: 15653

Added:
   monkey/src/include/platform.h
Modified:
   monkey/src/include/Makefile.am
   monkey/src/monkey/Makefile.am
   monkey/src/monkey/action_api.c
   monkey/src/monkey/edb_api.c
   monkey/src/monkey/gnunet-monkey.c
Log:
fixes

Modified: monkey/src/include/Makefile.am
===================================================================
--- monkey/src/include/Makefile.am      2011-06-16 11:05:56 UTC (rev 15652)
+++ monkey/src/include/Makefile.am      2011-06-16 11:09:11 UTC (rev 15653)
@@ -1,7 +1,8 @@
 SUBDIRS = .
 
-gnunetincludedir = $(includedir)/gnunet
+monkeyincludedir = $(includedir)/monkey
 
-#gnunetinclude_HEADERS = \
-#  gnunet_ext_service.h \
-#  gnunet_protocols_ext.h
+monkeyinclude_HEADERS = \
+  gettext.h \
+  plibc.h \
+  platform.h

Added: monkey/src/include/platform.h
===================================================================
--- monkey/src/include/platform.h                               (rev 0)
+++ monkey/src/include/platform.h       2011-06-16 11:09:11 UTC (rev 15653)
@@ -0,0 +1,250 @@
+/*
+     This file is part of GNUnet.
+     (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 Christian Grothoff 
(and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 2, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file include/platform.h
+ * @brief plaform specifics
+ *
+ * @author Nils Durner
+ *
+ * This file should never be included by installed
+ * header files (thos starting with "gnunet_").
+ */
+
+#ifndef PLATFORM_H
+#define PLATFORM_H
+
+#ifndef HAVE_USED_CONFIG_H
+#define HAVE_USED_CONFIG_H
+#if HAVE_CONFIG_H
+#include "monkey_config.h"
+#endif
+#endif
+
+#ifdef WINDOWS
+#define BREAKPOINT asm("int $3;");
+#define GNUNET_SIGCHLD 17
+#else
+#define BREAKPOINT
+#define GNUNET_SIGCHLD SIGCHLD
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#define ALLOW_EXTRA_CHECKS GNUNET_NO
+
+/**
+ * For strptime (glibc2 needs this).
+ */
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE
+#endif
+
+#ifndef _REENTRANT
+#define _REENTRANT
+#endif
+
+/* configuration options */
+
+#define VERBOSE_STATS 0
+
+#ifdef CYGWIN
+#include <sys/reent.h>
+#define _REENT_ONLY
+#endif
+
+#ifdef CYGWIN
+#undef _REENT_ONLY
+#endif
+
+#ifdef _MSC_VER
+#include <Winsock2.h>
+#include <ws2tcpip.h>
+#else
+#ifndef MINGW
+#include <netdb.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#if HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#if HAVE_NETINET_IN_SYSTM_H
+#include <netinet/in_systm.h>
+#endif
+#include <netinet/ip.h> /* superset of previous */
+#include <arpa/inet.h>
+#include <netinet/tcp.h>
+#include <pwd.h>
+#include <sys/ioctl.h>
+#include <sys/wait.h>
+#include <grp.h>
+#else
+#include "winproc.h"
+#endif
+#endif
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <signal.h>
+#ifdef WINDOWS
+#include <malloc.h> /* for alloca(), on other OSes it's in stdlib.h */
+#endif
+#ifndef _MSC_VER
+#include <unistd.h>             /* KLB_FIX */
+#endif
+#include <sys/stat.h>
+#include <sys/types.h>
+#ifndef _MSC_VER
+#include <dirent.h>             /* KLB_FIX */
+#endif
+#include <fcntl.h>
+#include <math.h>
+#if HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#if TIME_WITH_SYS_TIME
+#include <sys/time.h>
+#include <time.h>
+#else
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#else
+#include <time.h>
+#endif
+#endif
+
+#ifdef SOMEBSD
+#include <net/if.h>
+#endif
+#ifdef GNUNET_freeBSD
+#include <semaphore.h>
+#endif
+#ifdef DARWIN
+#include <dlfcn.h>
+#include <semaphore.h>
+#include <net/if.h>
+#endif
+#ifdef LINUX
+#include <net/if.h>
+#endif
+#ifdef SOLARIS
+#include <sys/sockio.h>
+#include <sys/filio.h>
+#include <sys/loadavg.h>
+#include <semaphore.h>
+#endif
+#if HAVE_UCRED_H
+#include <ucred.h>
+#endif
+#ifdef CYGWIN
+#include <windows.h>
+#include <cygwin/if.h>
+#endif
+#if HAVE_IFADDRS_H
+#include <ifaddrs.h>
+#endif
+#include <errno.h>
+#include <limits.h>
+
+#if HAVE_VFORK_H
+#include <vfork.h>
+#endif
+
+#include <ctype.h>
+#if HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
+
+#if HAVE_ENDIAN_H
+#include <endian.h>
+#endif
+#if HAVE_SYS_ENDIAN_H
+#include <sys/endian.h>
+#endif
+
+#include "plibc.h"
+
+#include <locale.h>
+#ifndef FRAMEWORK_BUILD
+#include "gettext.h"
+/**
+ * GNU gettext support macro.
+ */
+#define _(String) dgettext("gnunet",String)
+#define LIBEXTRACTOR_GETTEXT_DOMAIN "libextractor"
+#else
+#include "libintlemu.h"
+#define _(String) dgettext("org.gnunet.gnunet",String)
+#define LIBEXTRACTOR_GETTEXT_DOMAIN "org.gnunet.libextractor"
+#endif
+
+#ifdef CYGWIN
+#define SIOCGIFCONF     _IOW('s', 100, struct ifconf)   /* get if list */
+#define SIOCGIFFLAGS    _IOW('s', 101, struct ifreq)    /* Get if flags */
+#define SIOCGIFADDR     _IOW('s', 102, struct ifreq)    /* Get if addr */
+#endif
+
+#ifndef MINGW
+#include <sys/mman.h>
+#endif
+
+#ifdef FREEBSD
+#define __BYTE_ORDER BYTE_ORDER
+#define __BIG_ENDIAN BIG_ENDIAN
+#endif
+
+#ifdef DARWIN
+#define __BYTE_ORDER BYTE_ORDER
+#define __BIG_ENDIAN BIG_ENDIAN
+ /* not available on darwin, override configure */
+#undef HAVE_STAT64
+#undef HAVE_MREMAP
+#endif
+
+
+#if !HAVE_ATOLL
+long long atoll (const char *nptr);
+#endif
+
+#if ENABLE_NLS
+#include "langinfo.h"
+#endif
+
+#ifndef SIZE_MAX
+#define SIZE_MAX ((size_t)(-1))
+#endif
+
+#ifndef O_LARGEFILE
+#define O_LARGEFILE 0
+#endif
+
+#if defined(__sparc__)
+#define MAKE_UNALIGNED(val) ({ __typeof__((val)) __tmp; memmove(&__tmp, 
&(val), sizeof((val))); __tmp; })
+#else
+#define MAKE_UNALIGNED(val) val
+#endif
+
+#endif

Modified: monkey/src/monkey/Makefile.am
===================================================================
--- monkey/src/monkey/Makefile.am       2011-06-16 11:05:56 UTC (rev 15652)
+++ monkey/src/monkey/Makefile.am       2011-06-16 11:09:11 UTC (rev 15653)
@@ -23,7 +23,7 @@
   gnunet_monkey_edb.h
 
 libmonkeyedb_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  -lgnunetutil \
   -lsqlite3 \
   $(GN_LIBINTL) $(XLIB)  
 
@@ -32,7 +32,7 @@
   gnunet_monkey_action.h
 
 libmonkeyaction_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  -lgnunetutil \
   $(GN_LIBINTL) $(XLIB)  
 
 bin_PROGRAMS = \
@@ -66,7 +66,7 @@
  mail_sender.c
 
 gnunet_monkey_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  -lgnunetutil \
   $(top_builddir)/src/monkey/libmonkeyedb.la \
   $(top_builddir)/src/monkey/libmonkeyaction.la \
   -lesmtp \
@@ -76,7 +76,7 @@
 gnunet_service_monkey_SOURCES = \
  gnunet-service-monkey.c         
 gnunet_service_monkey_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  -lgnunetutil \
   $(GN_LIBINTL)
 
 
@@ -104,14 +104,14 @@
 test_monkey_edb_SOURCES = \
   test_monkey_edb.c
 test_monkey_edb_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la \
+  -lgnunetutil \
   $(top_builddir)/src/monkey/libmonkeyedb.la
 
 #test_gnunet_monkey_SOURCES = \
  #test_gnunet_monkey.c
 #test_gnunet_monkey_LDADD = \
-  #$(top_builddir)/src/arm/libgnunetarm.la \
-  #$(top_builddir)/src/util/libgnunetutil.la  
+  -lgnunetarm \
+  -lgnunetutil
 
 
 check_SCRIPTS = \

Modified: monkey/src/monkey/action_api.c
===================================================================
--- monkey/src/monkey/action_api.c      2011-06-16 11:05:56 UTC (rev 15652)
+++ monkey/src/monkey/action_api.c      2011-06-16 11:09:11 UTC (rev 15653)
@@ -24,10 +24,10 @@
  */
 
 #include "platform.h"
-#include "gnunet_common.h"
+#include <gnunet/gnunet_common.h>
 #include "gnunet_monkey_action.h"
 #include "gnunet_monkey_edb.h"
-#include "gnunet_container_lib.h"
+#include <gnunet/gnunet_container_lib.h>
 #include <libesmtp.h>
 
 extern void sendMail (const char *messageContents, const char *emailAddress);

Modified: monkey/src/monkey/edb_api.c
===================================================================
--- monkey/src/monkey/edb_api.c 2011-06-16 11:05:56 UTC (rev 15652)
+++ monkey/src/monkey/edb_api.c 2011-06-16 11:09:11 UTC (rev 15653)
@@ -24,7 +24,7 @@
  */
 
 #include "platform.h"
-#include "gnunet_common.h"
+#include <gnunet/gnunet_common.h>
 #include "gnunet_monkey_edb.h"
 #include <sqlite3.h>
 

Modified: monkey/src/monkey/gnunet-monkey.c
===================================================================
--- monkey/src/monkey/gnunet-monkey.c   2011-06-16 11:05:56 UTC (rev 15652)
+++ monkey/src/monkey/gnunet-monkey.c   2011-06-16 11:09:11 UTC (rev 15653)
@@ -25,9 +25,7 @@
 
 #include <stdio.h>
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_program_lib.h"
+#include <gnunet/gnunet_util_lib.h>
 #include "gnunet_monkey_action.h"
 
 static const char *mode;