Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
Icecast-common
Commits
c334915e
Commit
c334915e
authored
Feb 07, 2002
by
Jack Moffitt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor build fixes for win32 courtesy of Oddsock
svn path=/trunk/net/; revision=3029
parent
1e98ffc0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
11 deletions
+20
-11
net/resolver.c
net/resolver.c
+2
-2
net/sock.h
net/sock.h
+2
-3
thread/thread.c
thread/thread.c
+7
-0
timing/timing.c
timing/timing.c
+5
-3
timing/timing.h
timing/timing.h
+4
-3
No files found.
net/resolver.c
View file @
c334915e
...
...
@@ -8,16 +8,16 @@
#include <stdio.h>
#include <sys/types.h>
#include <stdlib.h>
#include <netdb.h>
#include <string.h>
#ifndef _WIN32
#include <netdb.h>
#include <sys/socket.h>
#include <pthread.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#else
#include <winsock.h>
#include <winsock
2
.h>
#define sethostent(x)
#endif
...
...
net/sock.h
View file @
c334915e
...
...
@@ -24,11 +24,10 @@
#ifdef _WIN32
#include <winsock2.h>
typedef
SOCKET
sock_t
#else
typedef
int
sock_t
;
#endif
typedef
int
sock_t
;
#define SOCK_ERROR -1
#define SOCK_BLOCK 0
#define SOCK_NONBLOCK 1
...
...
thread/thread.c
View file @
c334915e
...
...
@@ -28,6 +28,9 @@
#ifndef _WIN32
#include <unistd.h>
#include <sys/time.h>
#else
#include <windows.h>
#include <winbase.h>
#endif
#include <pthread.h>
...
...
@@ -38,6 +41,10 @@
#include "thread.h"
#include "avl.h"
#ifdef _WIN32
#define __FUNCTION__ __FILE__ ":" __LINE__
#endif
#define CATMODULE "thread"
#define LOG_ERROR(y) log_write(_logid, 1, CATMODULE "/" __FUNCTION__, y)
#define LOG_ERROR3(y, z1, z2, z3) log_write(_logid, 1, CATMODULE "/" __FUNCTION__, y, z1, z2, z3)
...
...
timing/timing.c
View file @
c334915e
...
...
@@ -4,14 +4,16 @@
#include <stdlib.h>
#include <sys/types.h>
#include <sys/time.h>
#include <unistd.h>
#ifdef HAVE_STDINT_H
# include <stdint.h>
#endif
#ifdef _WIN32
# include <mmsystem.h>
#include <windows.h>
#include <mmsystem.h>
#else
#include <sys/time.h>
#include <unistd.h>
#endif
#include "timing.h"
...
...
timing/timing.h
View file @
c334915e
...
...
@@ -3,11 +3,12 @@
#include <sys/types.h>
#ifdef HAVE_STDINT_H
#
include <stdint.h>
#include <stdint.h>
#endif
#ifdef _WIN32
typedef
int64
_t
__
int64
;
typedef
uint64_t
unsigned
__int64
;
typedef
__
int64
int64
_t
;
typedef
unsigned
__int64
uint64_t
;
#endif
uint64_t
timing_get_time
(
void
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment