sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,458 Commits 9 Branches 1 Tag
a89f479dd77b51331cd7203beb2bc618455f52ff
Commit Graph
108 Commits
Author SHA1 Message Date
Evgeni Golov 1bbe608f50 rename major/minor to majorVersion/minorVersion 
PokerTH fails to build on Debian GNU/kFreeBSD and GNU/Hurd with:
 In file included from src/third_party/protobuf/pokerth.pb.cc:4:0:
 src/third_party/protobuf/pokerth.pb.h:936:37: error: expected unqualified-id before 'int'
 src/third_party/protobuf/pokerth.pb.h:936:37: error: expected ')' before 'int'
 src/third_party/protobuf/pokerth.pb.h:936:37: error: expected ')' before 'int'
 src/third_party/protobuf/pokerth.pb.h:943:37: error: expected unqualified-id before 'int'
 src/third_party/protobuf/pokerth.pb.h:943:37: error: expected ')' before 'int'
 src/third_party/protobuf/pokerth.pb.h:943:37: error: expected ')' before 'int'
 src/third_party/protobuf/pokerth.pb.h:9618:60: error: expected unqualified-id before '(' token
 src/third_party/protobuf/pokerth.pb.h:9640:60: error: expected unqualified-id before '(' token
 src/third_party/protobuf/pokerth.pb.cc: In member function 'virtual void AnnounceMessage_Version::SerializeWithCachedSizes(google::protobuf::io::CodedOutputStream*) const':
 src/third_party/protobuf/pokerth.pb.cc:1581:72: error: expected unqualified-id before '(' token
 src/third_party/protobuf/pokerth.pb.cc:1581:72: error: expected primary-expression before ')' token
 src/third_party/protobuf/pokerth.pb.cc:1586:72: error: expected unqualified-id before '(' token
 src/third_party/protobuf/pokerth.pb.cc:1586:72: error: expected primary-expression before ')' token
 src/third_party/protobuf/pokerth.pb.cc: In member function 'virtual int AnnounceMessage_Version::ByteSize() const':
 src/third_party/protobuf/pokerth.pb.cc:1599:17: error: expected unqualified-id before '(' token
 src/third_party/protobuf/pokerth.pb.cc:1599:17: error: expected primary-expression before ')' token
 src/third_party/protobuf/pokerth.pb.cc:1606:17: error: expected unqualified-id before '(' token
 src/third_party/protobuf/pokerth.pb.cc:1606:17: error: expected primary-expression before ')' token
 src/third_party/protobuf/pokerth.pb.cc: In member function 'void AnnounceMessage_Version::MergeFrom(const AnnounceMessage_Version&)':
 src/third_party/protobuf/pokerth.pb.cc:1625:22: error: expected unqualified-id before '(' token
 src/third_party/protobuf/pokerth.pb.cc:1625:22: error: expected primary-expression before ')' token
 src/third_party/protobuf/pokerth.pb.cc:1628:22: error: expected unqualified-id before '(' token
 src/third_party/protobuf/pokerth.pb.cc:1628:22: error: expected primary-expression before ')' token
 src/third_party/protobuf/pokerth.pb.cc: At global scope:
 src/third_party/protobuf/pokerth.pb.cc:14319:6: warning: unused parameter 'output' [-Wunused-parameter]
 src/third_party/protobuf/pokerth.pb.cc:18344:6: warning: unused parameter 'output' [-Wunused-parameter]
 make[2]: *** [obj/pokerth.pb.o] Error 1

Renaming the vars to majorVersion/minorVersion fixes this issue.

The problem on kFreeBSD is, that
 /usr/include/sys/kern/types.h
has
 #define major(x)        ((int)(((u_int)(x) >> 8)&0xff)) /* major number */
 #define minor(x)        ((int)((x)&0xffff00ff))         /* minor number */
and this is included somewhere when you include stdlib.h, which protobuf's
headers do.

Hurd has similar definitions in /usr/include/i386-gnu/sys/sysmacros.h.
 2012-12-28 12:14:54 +01:00
lotodore 5e982e4c8f Switch to lite version of protobuf (for Android compatibility). 2012-11-06 23:31:41 +01:00
lotodore 02016381ef Multiple player info requests can be placed in one packet. 2012-09-24 12:22:13 +02:00
lotodore f0ee0af6ec Some work on protocol buffer details. 2012-09-23 23:19:53 +02:00
lotodore e16d4908bd Removing old ASN.1 stuff. 2012-09-22 15:42:59 +02:00
lotodore 8080fb6139 More work on tests. 2012-09-21 13:00:24 +02:00
lotodore 86c58fc7c8 Switching from ASN.1 (asn1c) to google protocol buffers. Some things are still missing (packet verification, tests, ...), this is very early stuff. 2012-09-18 15:57:58 +02:00
lotodore 617a4e953b Trying to fix build problems with gcc 4.7 on Linux (#132). 2012-05-02 08:41:07 +00:00
lotodore c63deb6010 Build file changes for android. 2012-04-22 09:24:27 +00:00
lotodore 3462a7060e Reverting invalid changes. 2012-03-31 20:17:10 +00:00
lotodore ac0041cb8f Preparing "reportGameName" network message. 2012-03-31 20:14:11 +00:00
lotodore 56335bc8e5 Updated asn1c to latest git version. 2012-01-07 20:47:41 +00:00
lotodore 79fa9df3c9 Consider game id in chat bot. Preparing new chat bot action: Mute player in game. 2012-01-07 09:31:28 +00:00
lotodore f8c1cdf56e Inform players when another player is no longer allowed to rejoin. 2011-12-22 20:10:18 +00:00
lotodore 38d224590a Send state of seats at the beginning of each hand. 2011-12-21 20:56:41 +00:00
lotodore 99616b4eed Send player state with each player action. autofold/disconnect timeout now depends on player action timeout. 2011-12-17 23:34:34 +00:00
lotodore edde9137ae CardsValue is now optionally sent by the server. 2011-11-13 15:31:35 +00:00
lotodore 32d26e3644 Removing AFK-warning message. Preparing integration of a new auto-AFK mode. 2011-11-07 21:07:13 +00:00
lotodore 60b96976b8 Removing unintended asn_system.h-change. 2011-10-26 21:47:25 +00:00
lotodore 0230edaec2 New start event type to mark a certain game start as "rejoin" (in order to show a special dialog). 2011-10-26 21:45:39 +00:00
lotodore aee0adbffe More protocol changes for rejoin. Re-adding server password to protocol. 2011-10-03 08:03:58 +00:00
lotodore b5a30d7def Adding missing protocol files. 2011-07-17 14:47:01 +00:00
lotodore d2720467b2 Last session id is only sent optionally, it can be omitted if not available. 2011-07-17 14:32:28 +00:00
lotodore d8ccf015d3 Protocol updates for more flexibility and better testing. 2011-07-17 14:12:10 +00:00
lotodore e109c0037d Preparing network protocol for rejoin. 2011-07-16 14:52:45 +00:00
lotodore c47e74d427 Removing libircclient from third_party. 2011-03-11 02:06:29 +00:00
lotodore e5b9b29564 Adding chat reject message if chat is tried to be sent in an invalid state. Otherwise testing won't work. 2011-02-17 23:57:58 +00:00
lotodore c4b8e567ed Implementing private messages in lobby chat, ticket #12. Some cosmetic improvements are still missing. 2011-02-11 23:02:29 +00:00
lotodore 6a2e993ac3 This was actually a duplicate - the file COPYING_asn1c already contains the license. 2011-02-11 09:29:28 +00:00
lotodore 562c7a3ee8 Explicitly adding boost software license 1.0 - source is http://www.boost.org/LICENSE_1_0.txt 2011-02-11 09:27:41 +00:00
lotodore 6563c3dd10 Explicitly adding asn1c "Copying" file to clarify which BSD license is used. Source for this file is https://github.com/vlm/asn1c which is exactly the asn1c version used. 2011-02-11 09:23:52 +00:00
lotodore 372c2466e8 Preparing use of boost Uuids for unique ids which can be used to rejoin a game (Ticket #5). This requires boost 1.42 or later. 2011-02-09 21:45:33 +00:00
lotodore d93aae6b50 Fixing cppcheck issues by removing unused files of the boost timer lib. 2011-02-09 19:48:22 +00:00
lotodore dd1f46177c Removing tinyxml directory from third_party. 2011-02-08 14:39:32 +00:00
lotodore e823b7b788 Implementing ticket #2 - optionally remove players from games after it was finished. This breaks protocol compatibility with 0.8. Config file option is NetAutoLeaveGameAfterFinish. 2011-02-06 13:17:07 +00:00
lotodore e729647cec Implementing optional unlimited thinking time in LAN games on server side (GUI missing) ticket #24 2011-02-06 10:37:40 +00:00
lotodore cf49041925 Regenerating protocol code. 2011-01-30 16:27:34 +00:00
lotodore d47994dfdb Regenerating protocol code. 2011-01-30 16:24:19 +00:00
lotodore dcb870542c Updating asn1c to latest git version. 2011-01-30 11:30:33 +00:00
lotodore 05cae76aee Re-generating chatcleaner protocol with latest version of asn1c. 2010-12-26 12:57:57 +00:00
lotodore f6d30e8703 Re-generating protocol code. 2010-12-24 11:42:02 +00:00
lotodore 026adae06b Updating asn1c to latest git version. 2010-11-28 00:14:03 +00:00
lotodore d874c2e561 Adding new join game failed reason. 2010-11-14 17:57:56 +00:00
lotodore 6b179cd8ca Adding missing protocol files. 2010-11-07 07:41:27 +00:00
lotodore 59f9ba5fef Adding new chat type for private messages in lobby. 2010-11-07 07:26:56 +00:00
lotodore b87fd5162f Updated asn1c to current svn and regenerated protocol code. 2010-10-13 16:00:22 +00:00
lotodore 2db2b17779 Fixing compiler warnings in libircclient. 2010-10-11 22:30:36 +00:00
lotodore 6272af336d Fixing compiler warnings in libircclient. 2010-10-11 22:21:32 +00:00
lotodore 845bf979dc Updating tinyxml to 2.6.1 (fixes small xml issues). 2010-10-11 16:09:14 +00:00
lotodore 820757e212 Generate protocol code. 2010-10-09 18:38:10 +00:00