generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-03-04 07:27:23 +01:00
Code Issues Projects Releases Wiki Activity

style fixes and SolarisStudio support backported from develop

Browse Source
This commit is contained in:
Guenter Obiltschnig 2017-01-25 11:07:51 +01:00
parent c117619e1e
commit 186e89923a
5 changed files with 90 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Crypto/include/Poco/Crypto/Cipher.h
View File

@ -96,7 +96,7 @@ public:
ENC_BASE64 = 0x01, /// Base64-encoded output
ENC_BINHEX = 0x02, /// BinHex-encoded output
ENC_BASE64_NO_LF = 0x81, /// Base64-encoded output, no linefeeds
ENC_BINHEX_NO_LF = 0x82, /// BinHex-encoded output, no linefeeds
ENC_BINHEX_NO_LF = 0x82 /// BinHex-encoded output, no linefeeds
};

14
Net/include/Poco/Net/DNS.h
View File

@ -42,13 +42,13 @@ public:
{
DNS_HINT_NONE = 0,
#ifdef POCO_HAVE_ADDRINFO
DNS_HINT_AI_PASSIVE = AI_PASSIVE, // Socket address will be used in bind() call
DNS_HINT_AI_CANONNAME = AI_CANONNAME, // Return canonical name in first ai_canonname
DNS_HINT_AI_NUMERICHOST = AI_NUMERICHOST, // Nodename must be a numeric address string
DNS_HINT_AI_NUMERICSERV = AI_NUMERICSERV, // Servicename must be a numeric port number
DNS_HINT_AI_ALL = AI_ALL, // Query both IP6 and IP4 with AI_V4MAPPED
DNS_HINT_AI_ADDRCONFIG = AI_ADDRCONFIG, // Resolution only if global address configured
DNS_HINT_AI_V4MAPPED = AI_V4MAPPED, // On v6 failure, query v4 and convert to V4MAPPED format
DNS_HINT_AI_PASSIVE = AI_PASSIVE, /// Socket address will be used in bind() call
DNS_HINT_AI_CANONNAME = AI_CANONNAME, /// Return canonical name in first ai_canonname
DNS_HINT_AI_NUMERICHOST = AI_NUMERICHOST, /// Nodename must be a numeric address string
DNS_HINT_AI_NUMERICSERV = AI_NUMERICSERV, /// Servicename must be a numeric port number
DNS_HINT_AI_ALL = AI_ALL, /// Query both IP6 and IP4 with AI_V4MAPPED
DNS_HINT_AI_ADDRCONFIG = AI_ADDRCONFIG, /// Resolution only if global address configured
DNS_HINT_AI_V4MAPPED = AI_V4MAPPED /// On v6 failure, query v4 and convert to V4MAPPED format
#endif
};

2
Net/include/Poco/Net/WebSocket.h
View File

@ -64,7 +64,7 @@ public:
FRAME_FLAG_FIN = 0x80, /// FIN bit: final fragment of a multi-fragment message.
FRAME_FLAG_RSV1 = 0x40, /// Reserved for future use. Must be zero.
FRAME_FLAG_RSV2 = 0x20, /// Reserved for future use. Must be zero.
FRAME_FLAG_RSV3 = 0x10, /// Reserved for future use. Must be zero.
FRAME_FLAG_RSV3 = 0x10 /// Reserved for future use. Must be zero.
};
enum FrameOpcodes

11
Net/src/NTPPacket.cpp
View File

@ -23,7 +23,12 @@
namespace Poco {
namespace Net {
#pragma pack(push,1)
#if !defined(POCO_COMPILER_SUN)
#pragma pack(push, 1)
#else
#pragma pack(1)
#endif
typedef struct _NTPPacketData {
Poco::Int8 mode:3;
Poco::Int8 vn:3;
@ -39,7 +44,11 @@ typedef struct _NTPPacketData {
Poco::Int64 vts;
Poco::Int64 tts;
} NTPPacketData;
#if !defined(POCO_COMPILER_SUN)
#pragma pack(pop)
#else
#pragma pack()
#endif
NTPPacket::NTPPacket() :

71
build/config/Linux-SolarisStudio Normal file
View File

@ -0,0 +1,71 @@
#
# $Id$
#
# Linux
#
# Make settings for Linux/SolarisStudio/
#
#
#
# General Settings
#
LINKMODE ?= SHARED
#
# Define Tools
#
CC = cc
CXX = CC
LINK = $(CXX)
LIB = $(CXX) -xar -o
RANLIB = ranlib
SHLIB = $(CXX) $(LINKFLAGS) -G -o $@ -h$(notdir $@)
SHLIBLN = $(POCO_BASE)/build/script/shlibln
STRIP = ${CROSS_COMPILE}strip
DEP = $(POCO_BASE)/build/script/makedepend.SunCC
SHELL = sh
RM = rm -rf
CP = cp
MKDIR = mkdir -p
#
# Extension for Shared Libraries
#
SHAREDLIBEXT = .so.$(target_version)
SHAREDLIBLINKEXT = .so
#
# Compiler and Linker Flags
#
CFLAGS = -mt
CFLAGS32 =
CFLAGS64 =
CXXFLAGS = -mt -std=c++03 -erroff=hidevf
CXXFLAGS32 =
CXXFLAGS64 =
LINKFLAGS = -mt -std=c++03
LINKFLAGS32 =
LINKFLAGS64 =
STATICOPT_CC =
STATICOPT_CXX =
STATICOPT_LINK = -Bstatic
SHAREDOPT_CC = -KPIC
SHAREDOPT_CXX = -KPIC
SHAREDOPT_LINK = -Bdynamic
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g
RELEASEOPT_CC = -xO3 -DNDEBUG
RELEASEOPT_CXX = -xO3 -DNDEBUG
RELEASEOPT_LINK = -xO3
#
# System Specific Flags
#
SYSFLAGS = -DPOCO_NO_GCC_API_ATTRIBUTE -DPOCO_NO_FPENVIRONMENT -D_XOPEN_SOURCE=500 -D_REENTRANT -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -DPOCO_NO_GCC_DIAG
#
# System Specific Libraries
#
SYSLIBS = -lpthread -ldl -lrt