$ git clone http://tcclient.ion.nu/tc_client.git
commit a4fdfded6d89262e55703dc6ad36757092c4e4ca
Author: Alicia <...>
Date: Thu Dec 17 16:47:00 2015 +0100
Minor build fixes.
diff --git a/ChangeLog b/ChangeLog
index 8a3f66a..e8be003 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
0.37:
Reimplemented announcement of moderators.
Reimplemented announcement of people cammed up when joining.
+Minor build fixes.
libcamera: added support for a virtual "Image" camera.
tc_client-gtk: added workarounds for the camera code (with the platform-agnostic "Image" camera) to work on windows.
libcamera: fixed compiler warnings.
diff --git a/Makefile b/Makefile
index c974e26..ae3fce2 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ irchack: $(IRCHACK_OBJ)
$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
modbot: $(MODBOT_OBJ)
- $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
+ $(CC) $(LDFLAGS) $^ $(LIBS) $(CURL_LIBS) -o $@
camviewer: $(CAMVIEWER_OBJ)
$(CC) $(LDFLAGS) $^ $(LIBS) $(GTK_LIBS) $(AVCODEC_LIBS) $(AVUTIL_LIBS) $(SWSCALE_LIBS) $(AVRESAMPLE_LIBS) $(SWRESAMPLE_LIBS) $(AO_LIBS) $(LIBV4L2_LIBS) -o $@
diff --git a/client.c b/client.c
index 0f6e73b..c01cfb1 100644
--- a/client.c
+++ b/client.c
@@ -145,9 +145,9 @@ char* getkey(int id, const char* channel)
char* getcookie(const char* channel)
{
- time_t now=time(0);
- char url[strlen("http://tinychat.com/cauth?t=&room=0")+snprintf(0,0, "%tu", now)+strlen(channel)];
- sprintf(url, "http://tinychat.com/cauth?t=%tu&room=%s", now, channel);
+ unsigned long long now=time(0);
+ char url[strlen("http://tinychat.com/cauth?t=&room=0")+snprintf(0,0, "%llu", now)+strlen(channel)];
+ sprintf(url, "http://tinychat.com/cauth?t=%llu&room=%s", now, channel);
char* response=http_get(url, 0);
char* cookie=strstr(response, "\"cookie\":\"");
diff --git a/utilities/compat.c b/utilities/compat.c
index ba15f60..193c07c 100644
--- a/utilities/compat.c
+++ b/utilities/compat.c
@@ -14,12 +14,12 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "compat.h"
#if defined(__ANDROID__) || defined(_WIN32)
// Android and windows have no dprintf, so we make our own
#include <stdio.h>
#include <unistd.h>
#include <stdarg.h>
+#include "compat.h"
size_t dprintf(int fd, const char* fmt, ...)
{
va_list va;