Commit 3338ad6d authored by Claes Sjofors's avatar Claes Sjofors

Merge branch 'master' of claes@pwrcvs:/data1/git/pwr

parents 206fbf3a 0a59cb5c
......@@ -42,6 +42,7 @@
needed to use CDH. */
#include <limits.h>
#include <stdlib.h>
#ifndef pwr_h
#include "pwr.h"
......
......@@ -354,7 +354,7 @@ else
echo "Mandatory :"
pwre_config_check_lib gtk GTK gtk gtk 0 "/usr/lib/libgtk-x11-2.0.so"
pwre_config_check_lib libantlr LIBANTLR lib wb 0 "/usr/local/lib/libantlr.a"
pwre_config_check_lib libantlr LIBANTLR lib wb 0 "/usr/lib/libantlr.a:/usr/local/lib/libantlr.a"
pwre_config_check_lib librpcsvc LIBRPCSVC lib lib 0 "/usr/lib/librpcsvc.so:/usr/lib/librpcsvc.a:/usr/lib/$hwpl-linux-gnu/librpcsvc.a"
pwre_config_check_lib libasound LIBASOUND lib lib 0 "/usr/lib/libasound.so:/usr/lib/libasound.a"
pwre_config_check_lib libpthread LIBPTHREAD lib lib 0 "/usr/lib/libpthread.so:/usr/lib/libpthread.a:/usr/lib/$hwpl-linux-gnu/libpthread.so"
......@@ -367,7 +367,7 @@ else
pwre_config_check_lib libfl LIBFL lib lib 0 "/usr/lib/libfl.so:/usr/lib/libfl.a"
pwre_config_check_lib libX11 LIBX11 lib lib 0 "/usr/lib/libX11.so:/usr/lib/$hwpl-linux-gnu/libX11.so"
pwre_config_check_include antlr ANTLR 1 "/usr/local/include/antlr/CommonAST.hpp"
pwre_config_check_include antlr ANTLR 1 "/usr/include/antlr/CommonAST.hpp:/usr/local/include/antlr/CommonAST.hpp"
pwre_config_check_include gtk GTK 1 "/usr/local/include/gtk-2.0/gtk.h:/usr/local/include/gtk-2.0/gtk/gtk.h:/usr/include/gtk-2.0/gtk/gtk.h"
pwre_config_check_include jni JNI 1 "$jdk/include/jni.h"
pwre_config_check_include jni JNI 0 "$jdk/include/linux/jni_md.h"
......
......@@ -479,7 +479,7 @@ elif [ $OpSys -eq $OpSys_X86_CYGWIN ]; then
# Suppress all warnings, -x
if [ $CurrentOpSys -eq $OpSys ]; then
cc_cmd="gcc -c -x c -w $cc_debug -D_REENTRANT -DOS_CYGWIN -DOS_POSIX -I$pwr_inc -I$pwrp_inc -I$pwrp_tmp $PWR_EXT_INC"
cc_cmd="gcc -c -x c -w $cc_debug -D_REENTRANT -DOS_CYGWIN -DOS_POSIX -I$pwr_inc -I$pwrp_inc -I$pwrp_tmp -I/usr/include/tirpc $PWR_EXT_INC"
FileTypeStr="`echo $vFileType| cut -f $FileTypeIdx -d ,`"
......
......@@ -124,12 +124,14 @@ extern "C" {
#define IS_OPENBSD(os) (os & pwr_mOpSys_X86_64_OPENBSD)
#define IS_CYGWIN(os) (os & pwr_mOpSys_X86_CYGWIN)
#define IS_LINUX(os) ((os & pwr_mOpSys_PPC_LINUX) \
|| (os & pwr_mOpSys_X86_LINUX) \
|| (os & pwr_mOpSys_X86_64_LINUX) \
|| (os & pwr_mOpSys_CustomBuild))
#define IS_UNIX(os) (IS_LINUX(os) || IS_LYNX(os) || IS_MACOS(os) || IS_FREEBSD(os) || IS_OPENBSD(os))
#define IS_UNIX(os) (IS_LINUX(os) || IS_LYNX(os) || IS_MACOS(os) || IS_FREEBSD(os) || IS_OPENBSD(os) || IS_CYGWIN(os))
#define IS_NOT_UNIX(os) (!IS_UNIX(os))
......@@ -887,6 +889,8 @@ static pwr_tStatus gcg_get_build_host(
strcpy(logname, "pwr_build_host_x86_64_freebsd");
else if (os & pwr_mOpSys_X86_64_OPENBSD)
strcpy(logname, "pwr_build_host_x86_64_openbsd");
else if (os & pwr_mOpSys_X86_CYGWIN)
strcpy(logname, "pwr_build_host_x86_cygwin");
else if (os & pwr_mOpSys_CustomBuild)
strcpy(logname, "pwr_build_host_custom_build");
else
......@@ -4703,6 +4707,7 @@ static int gcg_get_child_plcthread(
(IS_MACOS(os) && *scantime_ptr < 0.0000001) ||
(IS_FREEBSD(os) && *scantime_ptr < 0.0000001) ||
(IS_OPENBSD(os) && *scantime_ptr < 0.0000001) ||
(IS_CYGWIN(os) && *scantime_ptr < 0.0000001) ||
(IS_LYNX(os) && ((timebase <= 0) || ((timebase / 10) * 10) != timebase)) ||
(IS_VMS_OR_ELN(os) && ((timebase <= 0) || ((timebase / 10) * 10) != timebase)) ) {
gcg_plc_msg( gcgctx, GSX__BADSCANTIME, objdid);
......@@ -5245,6 +5250,11 @@ int gcg_comp_rtnode(
strcpy( os_str, "X86_64_OPENBSD"); /* Not used */
max_no_timebase = GCG_MAX_NO_TIMEBASE_LINUX;
break;
case pwr_mOpSys_X86_CYGWIN:
strcpy( objdir, "xxx");
strcpy( os_str, "X86_CYGWIN"); /* Not used */
max_no_timebase = GCG_MAX_NO_TIMEBASE_LINUX;
break;
case pwr_mOpSys_CustomBuild:
strcpy( objdir, "xxx");
strcpy( os_str, "CustomBuild"); /* Not used */
......@@ -5476,6 +5486,7 @@ int gcg_comp_rtnode(
case pwr_mOpSys_X86_64_MACOS:
case pwr_mOpSys_X86_64_FREEBSD:
case pwr_mOpSys_X86_64_OPENBSD:
case pwr_mOpSys_X86_CYGWIN:
case pwr_mOpSys_X86_LYNX:
case pwr_mOpSys_PPC_LYNX:
case pwr_mOpSys_CustomBuild:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment