Revision: 6507
http://playerstage.svn.sourceforge.net/playerstage/?rev=6507&view=rev
Author: gbiggs
Date: 2008-06-09 23:36:02 -0700 (Mon, 09 Jun 2008)
Log Message:
-----------
Fixed config.h, playerconfig.h and their little friends.
Modified Paths:
--------------
code/player/trunk/libplayercore/CMakeLists.txt
code/player/trunk/libplayercore/addr_util.c
code/player/trunk/libplayercore/addr_util.h
code/player/trunk/libplayercore/interface_util.h
code/player/trunk/libplayercore/playercore.h
Removed Paths:
-------------
code/player/trunk/libplayercore/playerconfig.h.in
Modified: code/player/trunk/libplayercore/CMakeLists.txt
===================================================================
--- code/player/trunk/libplayercore/CMakeLists.txt 2008-06-10 06:35:48 UTC
(rev 6506)
+++ code/player/trunk/libplayercore/CMakeLists.txt 2008-06-10 06:36:02 UTC
(rev 6507)
@@ -6,11 +6,6 @@
MESSAGE (FATAL_ERROR "No Python interpreter found. Cannot continue.")
ENDIF (NOT PYTHONINTERP_FOUND)
-# Auto-generate playerconfig.h.
-SET (playerconfig_h_in "${CMAKE_CURRENT_SOURCE_DIR}/playerconfig.h.in")
-SET (playerconfig_h "${CMAKE_CURRENT_BINARY_DIR}/playerconfig.h")
-CONFIGURE_FILE (${playerconfig_h_in} ${playerconfig_h})
-
SET (player_interfaces_h "${CMAKE_CURRENT_BINARY_DIR}/player_interfaces.h")
SET (interface_table_h "${CMAKE_CURRENT_BINARY_DIR}/interface_table.h")
PROCESS_INTERFACES ("" ${CMAKE_CURRENT_SOURCE_DIR}/interfaces
${player_interfaces_h})
Modified: code/player/trunk/libplayercore/addr_util.c
===================================================================
--- code/player/trunk/libplayercore/addr_util.c 2008-06-10 06:35:48 UTC (rev
6506)
+++ code/player/trunk/libplayercore/addr_util.c 2008-06-10 06:36:02 UTC (rev
6507)
@@ -2,8 +2,8 @@
* Player - One Hell of a Robot Server
* Copyright (C) <insert dates here>
* <insert author's name(s) here>
- *
*
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -48,7 +48,7 @@
#include <netdb.h>
#include <libplayercore/error.h> // for error macros
-#include <libplayercore/playerconfig.h>
+#include <playerconfig.h>
void
packedaddr_to_dottedip(char* dest, size_t len, uint32_t addr)
@@ -59,7 +59,7 @@
swappedaddr = htonl(addr);
assert(len >= (size_t)16);
-
+
sprintf(dest, "%u.%u.%u.%u",
swappedaddr>>24 & mask,
swappedaddr>>16 & mask,
Modified: code/player/trunk/libplayercore/addr_util.h
===================================================================
--- code/player/trunk/libplayercore/addr_util.h 2008-06-10 06:35:48 UTC (rev
6506)
+++ code/player/trunk/libplayercore/addr_util.h 2008-06-10 06:36:02 UTC (rev
6507)
@@ -2,8 +2,8 @@
* Player - One Hell of a Robot Server
* Copyright (C) <insert dates here>
* <insert author's name(s) here>
- *
*
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -43,7 +43,7 @@
extern "C" {
#endif
-#include <libplayercore/playerconfig.h>
+#include <playerconfig.h>
void packedaddr_to_dottedip(char* dest, size_t len, uint32_t addr);
int hostname_to_packedaddr(uint32_t* dest, const char* hostname);
Modified: code/player/trunk/libplayercore/interface_util.h
===================================================================
--- code/player/trunk/libplayercore/interface_util.h 2008-06-10 06:35:48 UTC
(rev 6506)
+++ code/player/trunk/libplayercore/interface_util.h 2008-06-10 06:36:02 UTC
(rev 6507)
@@ -49,7 +49,7 @@
#ifndef _INTERFACE_UTIL_H
#define _INTERFACE_UTIL_H
-#include <libplayercore/playerconfig.h> // for uint16_t type
+#include <playerconfig.h> // for uint16_t type
#ifdef __cplusplus
extern "C" {
Deleted: code/player/trunk/libplayercore/playerconfig.h.in
===================================================================
--- code/player/trunk/libplayercore/playerconfig.h.in 2008-06-10 06:35:48 UTC
(rev 6506)
+++ code/player/trunk/libplayercore/playerconfig.h.in 2008-06-10 06:36:02 UTC
(rev 6507)
@@ -1,18 +0,0 @@
-#cmakedefine HAVE_GEOS
-#cmakedefine HAVE_CFMAKERAW
-#cmakedefine HAVE_DIRNAME
-#cmakedefine HAVE_LIBLTDL
-#cmakedefine HAVE_PLAYERSD
-#cmakedefine HAVE_POLL
-#cmakedefine HAVE_ROUND
-#cmakedefine HAVE_STDINT_H
-#cmakedefine NEED_COMPRESSBOUND
-
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
-/* Logging level to console and system log */
-#cmakedefine DEBUG_LEVEL @DEBUG_LEVEL@
-
-#include <sys/types.h>
Modified: code/player/trunk/libplayercore/playercore.h
===================================================================
--- code/player/trunk/libplayercore/playercore.h 2008-06-10 06:35:48 UTC
(rev 6506)
+++ code/player/trunk/libplayercore/playercore.h 2008-06-10 06:36:02 UTC
(rev 6507)
@@ -51,11 +51,11 @@
#include <libplayercore/message.h>
#include <libplayercore/player.h>
#include <libplayercore/playercommon.h>
-#include <libplayercore/playerconfig.h>
#include <libplayercore/playertime.h>
#include <libplayercore/plugins.h>
#include <libplayercore/wallclocktime.h>
#include <libplayercore/addr_util.h>
#include <libplayercore/property.h>
+#include <playerconfig.h>
#endif
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
