summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfcolin2002-04-04 08:55:02 +0000
committerfcolin2002-04-04 08:55:02 +0000
commit94da62f234292a3f6b942cb33c1868427eea4eae (patch)
tree7c71a583d2ef97bee4a8d0924fbc579e9b50e7e4 /src
parent0804a5e035f41c70db089ccec7d06c6ebec09a56 (diff)
downloadivy-c-94da62f234292a3f6b942cb33c1868427eea4eae.zip
ivy-c-94da62f234292a3f6b942cb33c1868427eea4eae.tar.gz
ivy-c-94da62f234292a3f6b942cb33c1868427eea4eae.tar.bz2
ivy-c-94da62f234292a3f6b942cb33c1868427eea4eae.tar.xz
remove Timer struct def , and ## in ivy.c
Diffstat (limited to 'src')
-rw-r--r--src/ivy.c2
-rw-r--r--src/timer.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ivy.c b/src/ivy.c
index 770d97e..482fef5 100644
--- a/src/ivy.c
+++ b/src/ivy.c
@@ -45,7 +45,7 @@
* Obligatoire puisque la substitution de domain, et de bus n'est pas
* effectuée si on stringifie directement dans la macro GenerateIvyBus */
#define str(bus) #bus
-#define GenerateIvyBus(domain,bus) str(domain)##":"str(bus)
+#define GenerateIvyBus(domain,bus) str(domain)":"str(bus)
static char* DefaultIvyBus = GenerateIvyBus(DEFAULT_DOMAIN,DEFAULT_BUS);
typedef enum {
diff --git a/src/timer.c b/src/timer.c
index 5ccc690..f147232 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -43,7 +43,7 @@ struct _timer {
unsigned long when;
TimerCb callback;
void *user_data;
- }Timer;
+ };
/* liste des timers */
TimerId timers = NULL;