[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18257 - in libmwmodem: . src src/include src/main
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r18257 - in libmwmodem: . src src/include src/main |
|
Date: |
Tue, 22 Nov 2011 15:24:35 +0100 |
Author: ruppa
Date: 2011-11-22 15:24:35 +0100 (Tue, 22 Nov 2011)
New Revision: 18257
Added:
libmwmodem/libmwmodem.pc.in
libmwmodem/src/Makefile.am
libmwmodem/src/include/Makefile.am
libmwmodem/src/main/Makefile.am
Removed:
libmwmodem/configure.ac
Modified:
libmwmodem/src/main/libmwmodem.c
Log:
Deleted: libmwmodem/configure.ac
===================================================================
--- libmwmodem/configure.ac 2011-11-22 14:22:28 UTC (rev 18256)
+++ libmwmodem/configure.ac 2011-11-22 14:24:35 UTC (rev 18257)
@@ -1,455 +0,0 @@
-# This file is part of libmicrohttpd.
-# (C) 2006, 2007, 2008, 2009, 2010, 2011 Christian Grothoff (and other
contributing authors)
-#
-# libmicrohttpd 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.
-#
-# libmicrohttpd 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 libmicrohttpd; see the file COPYING. If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-#
-#
-# Process this file with autoconf to produce a configure script.
-#
-#
-AC_PREREQ(2.57)
-AC_INIT([libmicrohttpd], [0.9.16],address@hidden)
-AM_INIT_AUTOMAKE([libmicrohttpd], [0.9.16])
-AM_CONFIG_HEADER([MHD_config.h])
-AC_CONFIG_MACRO_DIR([m4])
-AH_TOP([#define _GNU_SOURCE 1])
-
-LIB_VERSION_CURRENT=23
-LIB_VERSION_REVISION=0
-LIB_VERSION_AGE=13
-AC_SUBST(LIB_VERSION_CURRENT)
-AC_SUBST(LIB_VERSION_REVISION)
-AC_SUBST(LIB_VERSION_AGE)
-
-if test `uname -s` = "OS/390"
-then
-# configure binaries for z/OS
- if test -z "$CC"
- then
- CC=`pwd`"/contrib/xcc"
- chmod +x $CC || true
- fi
- if test -z "$CPP"
- then
- CPP="c89 -E"
- fi
- if test -z "$CXXCPP"
- then
- CXXCPP="c++ -E -+"
- fi
-# _CCC_CCMODE=1
-# _C89_CCMODE=1
-fi
-
-# Checks for programs.
-AC_PROG_AWK
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AC_CANONICAL_HOST
-AM_PROG_CC_C_O
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
-AC_C_BIGENDIAN
-AC_CHECK_PROG(HAVE_CURL_BINARY,[curl],true,false)
-AM_CONDITIONAL(HAVE_CURL_BINARY,$HAVE_CURL_BINARY)
-
-
-# set GCC options
-# use '-fno-strict-aliasing', but only if the compiler can take it
-if gcc -fno-strict-aliasing -S -o /dev/null -xc /dev/null >/dev/null 2>&1;
-then
- CFLAGS="-fno-strict-aliasing $CFLAGS"
-fi
-
-# for pkg-config
-MHD_LIBDEPS=""
-
-# Check system type
-case "$host_os" in
-*darwin* | *rhapsody* | *macosx*)
- AC_DEFINE_UNQUOTED(OSX,1,[This is an OS X system])
- CFLAGS="-no-cpp-precomp -fno-common $CFLAGS"
- AM_CONDITIONAL(HAVE_GNU_LD, false)
- AM_CONDITIONAL(HAVE_W32, false)
- ;;
-linux*)
- AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system])
- AC_DEFINE_UNQUOTED(HAVE_LISTEN_SHUTDOWN,1,[can use shutdown on listen
sockets])
- AM_CONDITIONAL(HAVE_GNU_LD, true)
- AM_CONDITIONAL(HAVE_W32, false)
- ;;
-freebsd*)
- AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
- AC_DEFINE_UNQUOTED(FREEBSD,1,[This is a FreeBSD system])
- AM_CONDITIONAL(HAVE_GNU_LD, true)
- AM_CONDITIONAL(HAVE_W32, false)
- CFLAGS="-D_THREAD_SAFE $CFLAGS"
- ;;
-openbsd*)
- AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
- AC_DEFINE_UNQUOTED(OPENBSD,1,[This is an OpenBSD system])
- AM_CONDITIONAL(HAVE_GNU_LD, true)
- AM_CONDITIONAL(HAVE_W32, false)
- ;;
-netbsd*)
- AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
- AC_DEFINE_UNQUOTED(NETBSD,1,[This is a NetBSD system])
- AM_CONDITIONAL(HAVE_GNU_LD, true)
- AM_CONDITIONAL(HAVE_W32, false)
- ;;
-*solaris*)
- AC_DEFINE_UNQUOTED(SOLARIS,1,[This is a Solaris system])
- AC_DEFINE_UNQUOTED(_REENTRANT,1,[Need with solaris or errno doesnt work])
- AM_CONDITIONAL(HAVE_GNU_LD, false)
- AM_CONDITIONAL(HAVE_W32, false)
- LDFLAGS="$LDFLAGS -lpthread"
- ;;
-*arm-linux*)
- AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system])
- AC_DEFINE_UNQUOTED(HAVE_LISTEN_SHUTDOWN,1,[can use shutdown on listen
sockets])
- CFLAGS="-D_REENTRANT -fPIC -pipe $CFLAGS"
- AM_CONDITIONAL(HAVE_GNU_LD, true)
- AM_CONDITIONAL(HAVE_W32, false)
- ;;
-*cygwin*)
- AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system])
- AM_CONDITIONAL(HAVE_GNU_LD, false)
- AM_CONDITIONAL(HAVE_W32, false)
- LDFLAGS="$LDFLAGS -no-undefined"
- ;;
-*mingw*)
- AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system])
- AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system])
- AM_CONDITIONAL(HAVE_W32, true)
- LDFLAGS="$LDFLAGS -no-undefined -Wl,--export-all-symbols -lws2_32"
- AM_CONDITIONAL(HAVE_GNU_LD, true)
- # check if PlibC is available
- CHECK_PLIBC
- LIBS="$PLIBC_LIBS $LIBS"
- AC_SUBST(PLIBC_LIBS)
- AC_SUBST(PLIBC_LDFLAGS)
- AC_SUBST(PLIBC_CPPFLAGS)
- ;;
-*openedition*)
- AC_DEFINE_UNQUOTED(OS390,1,[This is a OS/390 system])
- AM_CONDITIONAL(HAVE_GNU_LD, false)
- AM_CONDITIONAL(HAVE_W32, false)
- ;;
-*)
- AC_MSG_RESULT(Unrecognised OS $host_os)
- AC_DEFINE_UNQUOTED(OTHEROS,1,[Some strange OS])
-# You might want to find out if your OS supports shutdown on listen sockets,
-# and extend the switch statement; if we do not have 'HAVE_LISTEN_SHUTDOWN',
-# pipes are used instead to signal 'select'.
-# AC_DEFINE_UNQUOTED(HAVE_LISTEN_SHUTDOWN,1,[can use shutdown on listen
sockets])
- AM_CONDITIONAL(HAVE_GNU_LD, false)
- AM_CONDITIONAL(HAVE_W32, false)
-;;
-esac
-
-CHECK_PTHREAD
-LIBS="$PTHREAD_LIBS $LIBS"
-AC_SUBST(PTHREAD_LIBS)
-AC_SUBST(PTHREAD_LDFLAGS)
-AC_SUBST(PTHREAD_CPPFLAGS)
-
-# Check for headers that are ALWAYS required
-AC_CHECK_HEADERS([fcntl.h math.h errno.h limits.h stdio.h locale.h sys/stat.h
sys/types.h pthread.h],,AC_MSG_ERROR([Compiling libmicrohttpd requires standard
UNIX headers files]))
-
-# Check for optional headers
-AC_CHECK_HEADERS([sys/types.h sys/time.h sys/msg.h netdb.h netinet/in.h
netinet/tcp.h time.h sys/socket.h sys/mman.h arpa/inet.h sys/select.h poll.h
winsock2.h ws2tcpip.h])
-
-# Check for plibc.h from system, if not found, use our own
-AC_CHECK_HEADERS([plibc.h],our_private_plibc_h=0,our_private_plibc_h=1)
-AM_CONDITIONAL(USE_PRIVATE_PLIBC_H, test x$our_private_plibc_h = x1)
-
-AC_CHECK_FUNCS(memmem)
-
-# IPv6
-AC_MSG_CHECKING(for IPv6)
-AC_TRY_COMPILE([
-#include <stdio.h>
-#if HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#if HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#if HAVE_WINSOCK2_H
-#include <winsock2.h>
-#endif
-#if HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
-],[
-int af=AF_INET6;
-int pf=PF_INET6;
-struct sockaddr_in6 sa;
-printf("%d %d %p\n", af, pf, &sa);
-],[
-have_inet6=yes;
-AC_DEFINE([HAVE_INET6], [1], [Provides IPv6 headers])
-],
-have_inet6=no
-)
-AC_MSG_RESULT($have_inet6)
-
-# TCP_CORK
-AC_CHECK_DECLS([TCP_CORK], [], [], [[#include <netinet/tcp.h>]])
-
-# TCP_NOPUSH
-AC_CHECK_DECLS([TCP_NOPUSH], [], [], [[#include <netinet/tcp.h>]])
-
-# libcurl (required for testing)
-SAVE_LIBS=$LIBS
-
-AC_MSG_CHECKING(whether to use libcurl for testing)
-AC_ARG_ENABLE([curl],
- [AS_HELP_STRING([--disable-curl],[disable cURL based testcases])],
- [enable_curl=${enableval}],
- [enable_curl=yes])
-AC_MSG_RESULT($enable_curl)
-curl=0
-if test "$enable_curl" = "yes"
-then
- LIBCURL_CHECK_CONFIG(,,curl=1,curl=0)
-# Lib cURL & cURL - OpenSSL versions
- MHD_REQ_CURL_VERSION=7.16.4
- MHD_REQ_CURL_OPENSSL_VERSION=0.9.8
- MHD_REQ_CURL_GNUTLS_VERSION=2.8.6
- MHD_REQ_CURL_NSS_VERSION=3.12.0
- AC_DEFINE_UNQUOTED([MHD_REQ_CURL_VERSION], "$MHD_REQ_CURL_VERSION",
[required cURL version to run tests])
- AC_DEFINE_UNQUOTED([MHD_REQ_CURL_OPENSSL_VERSION],
"$MHD_REQ_CURL_OPENSSL_VERSION", [required cURL SSL version to run tests])
- AC_DEFINE_UNQUOTED([MHD_REQ_CURL_GNUTLS_VERSION],
"$MHD_REQ_CURL_GNUTLS_VERSION", [gnuTLS lib version - used in conjunction with
cURL])
- AC_DEFINE_UNQUOTED([MHD_REQ_CURL_NSS_VERSION], "$MHD_REQ_CURL_NSS_VERSION",
[NSS lib version - used in conjunction with cURL])
-fi
-LIBS=$SAVE_LIBS
-AM_CONDITIONAL(HAVE_CURL, test x$curl = x1)
-
-# large file support (> 4 GB)
-AC_SYS_LARGEFILE
-AC_FUNC_FSEEKO
-
-# optional: have error messages ?
-AC_MSG_CHECKING(whether to generate error messages)
-AC_ARG_ENABLE([messages],
- [AS_HELP_STRING([--disable-messages],
- [disable MHD error messages])],
- [enable_messages=${enableval}],
- [enable_messages=yes])
-AC_MSG_RESULT($enable_messages)
-if test "$enable_messages" = "yes"
-then
- AC_DEFINE([HAVE_MESSAGES],[1],[Include error messages])
-else
- AC_DEFINE([HAVE_MESSAGES],[0],[Disable error messages])
-fi
-
-
-# optional: have postprocessor?
-AC_MSG_CHECKING(whether to enable postprocessor)
-AC_ARG_ENABLE([postprocessor],
- [AS_HELP_STRING([--disable-postprocessor],
- [disable MHD PostProcessor functionality])],
- [enable_postprocessor=${enableval}],
- [enable_postprocessor=yes])
-AC_MSG_RESULT($disable_postprocessor)
-AM_CONDITIONAL([HAVE_POSTPROCESSOR],test x$enable_postprocessor != xno)
-
-
-# optional: have zzuf, socat?
-AC_CHECK_PROG([HAVE_ZZUF],[zzuf], 1, 0)
-AC_CHECK_PROG([HAVE_SOCAT],[socat], 1, 0)
-AM_CONDITIONAL(HAVE_ZZUF, test 0 != $HAVE_ZZUF)
-AM_CONDITIONAL(HAVE_SOCAT, test 0 != $HAVE_SOCAT)
-
-
-# libgcrypt linkage: required for HTTPS support
-AM_PATH_LIBGCRYPT(1.2.2, gcrypt=true)
-
-# define the minimal version of libgcrypt required
-MHD_GCRYPT_VERSION=1:1.2.2
-AC_DEFINE_UNQUOTED([MHD_GCRYPT_VERSION], "$MHD_GCRYPT_VERSION", [gcrypt lib
version])
-
-
-# gnutls
-gnutls=0
-AC_MSG_CHECKING(for gnutls)
-AC_ARG_WITH(gnutls,
- [ --with-gnutls=PFX base of gnutls installation],
- [AC_MSG_RESULT([$with_gnutls])
- case $with_gnutls in
- no)
- ;;
- yes)
- AC_CHECK_HEADERS([gnutls/gnutls.h],
- AC_CHECK_LIB([gnutls], [gnutls_priority_set],
- gnutls=true))
- ;;
- *)
- LDFLAGS="-L$with_gnutls/lib $LDFLAGS"
- CPPFLAGS="-I$with_gnutls/include $CPPFLAGS"
- AC_CHECK_HEADERS([gnutls/gnutls.h],
- AC_CHECK_LIB([gnutls], [gnutls_priority_set],
- EXT_LIB_PATH="-L$with_gnutls/lib $EXT_LIB_PATH"
- gnutls=true))
- ;;
- esac
- ],
- [AC_MSG_RESULT([--with-gnutls not specified])
- AC_CHECK_HEADERS([gnutls/gnutls.h],
- AC_CHECK_LIB([gnutls], [gnutls_priority_set],
- gnutls=true))])
-AM_CONDITIONAL(HAVE_GNUTLS, test x$gnutls = xtrue)
-AC_DEFINE_UNQUOTED([HAVE_GNUTLS], $gnutls, [We have gnutls])
-
-
-
-# optional: HTTPS support. Enabled by default
-AC_MSG_CHECKING(whether to support HTTPS)
-AC_ARG_ENABLE([https],
- [AS_HELP_STRING([--disable-https],
- [disable HTTPS support])],
- [enable_https=${enableval}],
- [enable_https=yes])
-if test "$enable_https" = "yes"
-then
- if test "$gcrypt" = "true" -a "$gnutls" = "true"
- then
- AC_DEFINE([HTTPS_SUPPORT],[1],[include HTTPS support])
- MHD_LIBDEPS="$LIBGCRYPT_LIBS"
- else
- AC_DEFINE([HTTPS_SUPPORT],[0],[no libgcrypt or libgnutls])
- enable_https="no (lacking libgcrypt or libgnutls)"
- fi
-else
- AC_DEFINE([HTTPS_SUPPORT],[0],[disable HTTPS support])
- enable_https="no (disabled)"
-fi
-AC_MSG_RESULT($enable_https)
-
-AM_CONDITIONAL(ENABLE_HTTPS, test "$enable_https" = "yes")
-
-# optional: HTTP Digest Auth support. Enabled by default
-AC_MSG_CHECKING(whether to support HTTP basic and digest authentication)
-AC_ARG_ENABLE([dauth],
- AS_HELP_STRING([--disable-dauth],
- [disable HTTP basic and digest Auth support]),
- [enable_dauth=${enableval}],
- [enable_dauth=yes])
-
-if test "$enable_dauth" = "yes"
-then
- AC_DEFINE([DAUTH_SUPPORT],[1],[include basic and digest Auth support])
-else
- AC_DEFINE([DAUTH_SUPPORT],[0],[disable basic and digest Auth support])
-fi
-AC_MSG_RESULT($enable_dauth)
-
-AM_CONDITIONAL(ENABLE_DAUTH, [test "x$enable_dauth" != "xno"])
-
-MHD_LIB_LDFLAGS="-export-dynamic -no-undefined"
-
-# TODO insert a proper check here
-AC_CACHE_CHECK([whether -export-symbols-regex works],
- gn_cv_export_symbols_regex_works,
- [
- case "$host_os" in
- mingw*) gn_cv_export_symbols_regex_works=no;;
- *) gn_cv_export_symbols_regex_works=yes;;
- esac
- ])
-
-
-# gcov compilation
-AC_MSG_CHECKING(whether to compile with support for code coverage analysis)
-AC_ARG_ENABLE([coverage],
- AS_HELP_STRING([--enable-coverage],
- [compile the library with code coverage support]),
- [use_gcov=${enableval}],
- [use_gcov=no])
-AC_MSG_RESULT($use_gcov)
-AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"])
-
-
-AC_SUBST(MHD_LIB_LDFLAGS)
-
-# for pkg-config
-AC_SUBST(MHD_LIBDEPS)
-
-AC_SUBST(CPPFLAGS)
-AC_SUBST(LIBS)
-AC_SUBST(LDFLAGS)
-AC_SUBST(EXT_LIB_PATH)
-AC_SUBST(EXT_LIBS)
-
-AC_CONFIG_FILES([
-libmicrohttpd.pc
-Makefile
-contrib/Makefile
-doc/Makefile
-m4/Makefile
-src/Makefile
-src/include/Makefile
-src/include/plibc/Makefile
-src/daemon/Makefile
-src/examples/Makefile
-src/testcurl/Makefile
-src/testcurl/https/Makefile
-src/testzzuf/Makefile])
-AC_OUTPUT
-
-AM_CONDITIONAL(ENABLE_MINITASN1, [test -n " " ] )
-AM_CONDITIONAL(ENABLE_OPENSSL, [test -n "" ] )
-AM_CONDITIONAL(HAVE_LD_OUTPUT_DEF, [test -n "" ] )
-AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, [test -n "" ] )
-
-# Finally: summary
-if test "$curl" != 1 ; then
- MSG_CURL="no, many unit tests will not run"
-else
- MSG_CURL="yes"
-fi
-
-if test "$gcrypt" != true
-then
- MSG_GCRYPT="no, HTTPS will not be built"
-else
- MSG_GCRYPT="yes"
-fi
-
-AC_MSG_NOTICE([Configuration Summary:
- Operating System: ${host_os}
- libgcrypt: ${MSG_GCRYPT}
- libcurl (testing): ${MSG_CURL}
- Target directory: ${prefix}
- Messages: ${enable_messages}
- HTTP Authentic.: ${enable_dauth}
- Postproc: ${enable_postprocessor}
- HTTPS support: ${enable_https}
-])
-
-if test "x$enable_https" = "xyes"
-then
- AC_MSG_NOTICE([HTTPS subsystem configuration:
- License : LGPL only
- ])
-else
- AC_MSG_NOTICE([
- License : LGPL or eCos
-])
-fi
Added: libmwmodem/libmwmodem.pc.in
===================================================================
--- libmwmodem/libmwmodem.pc.in (rev 0)
+++ libmwmodem/libmwmodem.pc.in 2011-11-22 14:24:35 UTC (rev 18257)
@@ -0,0 +1,13 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: libmwmodem
+Description: A library for parsing signal information from microwork satellite
modem
+Version: @VERSION@
+Requires:
+Conflicts:
+Libs: -L${libdir} -lmwmodem
+Libs.private: @MHD_LIBDEPS@
+Cflags: -I${includedir}
Added: libmwmodem/src/Makefile.am
===================================================================
--- libmwmodem/src/Makefile.am (rev 0)
+++ libmwmodem/src/Makefile.am 2011-11-22 14:24:35 UTC (rev 18257)
@@ -0,0 +1,4 @@
+if HAVE_Test
+tests = test
+endif
+SUBDIRS = include main $(tests) .
Added: libmwmodem/src/include/Makefile.am
===================================================================
--- libmwmodem/src/include/Makefile.am (rev 0)
+++ libmwmodem/src/include/Makefile.am 2011-11-22 14:24:35 UTC (rev 18257)
@@ -0,0 +1 @@
+include_HEADERS = libmwmodem.h
\ No newline at end of file
Added: libmwmodem/src/main/Makefile.am
===================================================================
--- libmwmodem/src/main/Makefile.am (rev 0)
+++ libmwmodem/src/main/Makefile.am 2011-11-22 14:24:35 UTC (rev 18257)
@@ -0,0 +1,59 @@
+AM_CPPFLAGS = \
+ $(PLIBC_INCLUDE) \
+ -I$(top_srcdir)/src/include \
+ -I$(top_srcdir)/src/daemon \
+ @LIBGCRYPT_CFLAGS@
+
+lib_LTLIBRARIES = \
+ libmwmodem.la
+
+
+libmicrohttpd_la_SOURCES = \
+ libmwmode.c libmwmodem.h
+libmicrohttpd_la_LDFLAGS = \
+ $(MHD_LIB_LDFLAGS) \
+ -version-info @LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@
+
+if USE_COVERAGE
+ AM_CFLAGS = --coverage
+endif
+
+if HAVE_POSTPROCESSOR
+libmicrohttpd_la_SOURCES += \
+ postprocessor.c
+endif
+
+if ENABLE_DAUTH
+libmicrohttpd_la_SOURCES += \
+ digestauth.c \
+ md5.c md5.h \
+ base64.c base64.h
+endif
+
+if ENABLE_HTTPS
+libmicrohttpd_la_SOURCES += \
+ connection_https.c connection_https.h
+libmicrohttpd_la_LIBADD = -lgnutls @LIBGCRYPT_LIBS@
+endif
+
+check_PROGRAMS = \
+ postprocessor_test \
+ postprocessor_large_test \
+ daemon_test
+
+TESTS = $(check_PROGRAMS)
+
+daemon_test_SOURCES = \
+ daemon_test.c
+daemon_test_LDADD = \
+ $(top_builddir)/src/daemon/libmicrohttpd.la
+
+postprocessor_test_SOURCES = \
+ postprocessor_test.c
+postprocessor_test_LDADD = \
+ $(top_builddir)/src/daemon/libmicrohttpd.la
+
+postprocessor_large_test_SOURCES = \
+ postprocessor_large_test.c
+postprocessor_large_test_LDADD = \
+ $(top_builddir)/src/daemon/libmicrohttpd.la
Modified: libmwmodem/src/main/libmwmodem.c
===================================================================
--- libmwmodem/src/main/libmwmodem.c 2011-11-22 14:22:28 UTC (rev 18256)
+++ libmwmodem/src/main/libmwmodem.c 2011-11-22 14:24:35 UTC (rev 18257)
@@ -22,6 +22,8 @@
#include <sys/socket.h>
#include <stdint.h>
+uint32_t val;
+
struct MWMODEM_Content * MWMODEM_init (uint16_t port, int af_int,
MWMODEM_Information_Callback cb, void *cb_cls)
{
static struct MWMODEM_Content *content;
@@ -198,7 +200,7 @@
uint32_t charArrayToInt (char byte4[4])
{
- uint32_t val = (uint32_t)byte4[3]
+ val = (uint32_t)byte4[3]
| (uint32_t)byte4[2] << 8
| (uint32_t)byte4[1] << 16
| (uint32_t)byte4[0] << 24;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18257 - in libmwmodem: . src src/include src/main,
gnunet <=